From 72f5a64cf33392f7c0089fab29288841c95a76c8 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 31 Dec 2023 05:15:25 +0000 Subject: [PATCH] Use verb --- src/Content/Conversation.php | 3 --- src/Model/Post/Counts.php | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index 99e4b6f8f7..453fe7a663 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -1062,9 +1062,6 @@ class Conversation if (isset($emojis[$row['thr-parent-id']][$emoji]['title'])) { $emojis[$row['thr-parent-id']][$emoji]['title'] = array_unique(array_merge($emojis[$row['thr-parent-id']][$emoji]['title'] ?? [], explode($separator, $row['title']))); - } else { - Post\Counts::updateForPost($row['thr-parent-id'], $row['parent-uri-id']); - $this->logger->debug('Add missing counts', ['thr-parent-id' => $row['thr-parent-id'], 'parent-uri-id' => $row['parent-uri-id'], 'emoji' => $emoji]); } } DBA::close($rows); diff --git a/src/Model/Post/Counts.php b/src/Model/Post/Counts.php index efa5997a27..230b41f5cb 100644 --- a/src/Model/Post/Counts.php +++ b/src/Model/Post/Counts.php @@ -106,16 +106,16 @@ class Counts Activity::READ => '📖', ]; - $vids = array_merge(array_keys($activity_emoji), [Activity::EMOJIREACT, Activity::POST]); + $verbs = array_merge(array_keys($activity_emoji), [Activity::EMOJIREACT, Activity::POST]); - $condition = DBA::mergeConditions($condition, ['verb' => $vids]); + $condition = DBA::mergeConditions($condition, ['verb' => $verbs]); $countquery = DBA::select('post-counts-view', [], $condition); while ($count = DBA::fetch($countquery)) { if (!empty($count['reaction'])) { $count['verb'] = Activity::EMOJIREACT; $count['vid'] = Verb::getID($count['verb']); - } elseif (!empty($activity_emoji[$count['vid']])) { - $count['reaction'] = $activity_emoji[$count['vid']]; + } elseif (!empty($activity_emoji[$count['verb']])) { + $count['reaction'] = $activity_emoji[$count['verb']]; } $counts[] = $count; }