Call it after instead to match existing parameter

ppy · Jul 11, 2023 · 7d9bd08 · 7d9bd08
1 parent 3cfb42a
commit 7d9bd08
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/app/Http/Controllers/CommentsController.php b/app/Http/Controllers/CommentsController.php
@@ -67,7 +67,7 @@ public function destroy($id)
      *
      * `pinned_comments` is only included when `commentable_type` and `commentable_id` are specified.
      *
-     * @queryParam after_id Return comments which come after the specified comment id as per sort option. No-example
+     * @queryParam after Return comments which come after the specified comment id as per sort option. No-example
      * @queryParam commentable_type The type of resource to get comments for. Example: beatmapset
      * @queryParam commentable_id The id of the resource to get comments for. Example: 1
      * @queryParam cursor Pagination option. See [CommentSort](#commentsort) for detail. The format follows [Cursor](#cursor) except it's not currently included in the response. No-example

diff --git a/app/Libraries/CommentBundle.php b/app/Libraries/CommentBundle.php
@@ -183,10 +183,10 @@ private function getComments($query, $isChildren = true, $pinnedOnly = false)
 
             $queryLimit++;
 
-            if ($this->params->afterId === null) {
+            if ($this->params->after === null) {
                 $cursor = $this->params->cursor;
             } else {
-                $lastComment = Comment::findOrFail($this->params->afterId);
+                $lastComment = Comment::findOrFail($this->params->after);
                 $cursor = $cursorHelper->next([$lastComment]);
             }
 

diff --git a/app/Libraries/CommentBundleParams.php b/app/Libraries/CommentBundleParams.php
@@ -13,7 +13,7 @@ class CommentBundleParams
     const DEFAULT_PAGE = 1;
     const DEFAULT_LIMIT = 50;
 
-    public ?int $afterId = null;
+    public ?int $after = null;
     public $userId;
     public $commentableId;
     public $commentableType;
@@ -65,7 +65,7 @@ public function setAll($params)
         $this->cursorHelper = Comment::makeDbCursorHelper($params['sort'] ?? $this->sort);
         $this->cursor = get_arr($params['cursor'] ?? null);
         $this->sort = $this->cursorHelper->getSortName();
-        $this->afterId = get_int($params['after_id'] ?? null);
+        $this->after = get_int($params['after'] ?? null);
     }
 
     public function filterByParentId()

diff --git a/resources/js/components/comment-show-more.tsx b/resources/js/components/comment-show-more.tsx
@@ -67,12 +67,7 @@ export default class CommentShowMore extends React.Component<Props> {
 
     const lastComment = last(this.props.comments);
     if (lastComment != null) {
-      // TODO: convert to plain after_id params of some sort instead of cursor
-      params.cursor = {
-        created_at: lastComment.createdAt,
-        id: lastComment.id,
-        votes_count: lastComment.votesCount,
-      };
+      params.after = lastComment.id;
     }
 
     this.xhr = $.ajax(route('comments.index'), { data: params, dataType: 'json' });