Merge pull request #11127 from nanaya/view-count-topic

More relaxed topic view count

Author: notbakaneko

app/Http/Controllers/Forum/TopicsController.php

@@ -428,6 +428,7 @@ public function show($id)
 
         $pollSummary = PollOption::summary($topic, $currentUser);
 
+        $topic->incrementViewCount($currentUser, \Request::ip());
         $posts->last()->markRead($currentUser);
 
         $coverModel = $topic->cover ?? new TopicCover();

app/Models/Forum/Topic.php

@@ -103,6 +103,8 @@ class Topic extends Model implements AfterCommit
         'topic_title' => 100,
     ];
 
+    const VIEW_COUNT_INTERVAL = 86400; // 1 day
+
     protected $table = 'phpbb_topics';
     protected $primaryKey = 'topic_id';
 
@@ -541,8 +543,6 @@ public function markRead($user, $markTime)
 
                 throw $ex;
             }
-
-            $this->incrementInstance('topic_views');
         } elseif ($status->mark_time < $markTime) {
             $status->update(['mark_time' => $markTime]);
         }
@@ -555,6 +555,18 @@ public function markRead($user, $markTime)
         DB::commit();
     }
 
+    public function incrementViewCount(?User $user, string $ipAddr): void
+    {
+        $lockKey = "view:forum_topic:{$this->getKey()}:";
+        $lockKey .= $user === null
+            ? "guest:{$ipAddr}"
+            : "user:{$user->getKey()}";
+
+        if (\Cache::lock($lockKey, static::VIEW_COUNT_INTERVAL)->get()) {
+            $this->incrementInstance('topic_views');
+        }
+    }
+
     public function isIssue()
     {
         return in_array($this->forum_id, $GLOBALS['cfg']['osu']['forum']['issue_forum_ids'], true);