1 files changed, 9 insertions, 2 deletions
diff --git a/src/queries/comments_query.py b/src/queries/comments_query.py
index e343667..5312cca 100644
--- a/src/queries/comments_query.py
+++ b/src/queries/comments_query.py
@@ -10,9 +10,16 @@ class CommentsQuery(BaseQuery):
     def all_comments(self):
         return db.paginate(db.select(Comment))
 
-    def comments_of_post(self, post):
+    def comments_of_post(self, post, page=1):
+        try:
+            if page is not None and isinstance(page, str):
+                page = int(page)
+        except ValueError:
+            page = 1
+
         return db.paginate(
-            db.select(Comment).where(Comment.post == post).order_by(Comment.created_at.desc())
+            db.select(Comment).where(Comment.post == post).order_by(Comment.created_at.desc()),
+            page=page, max_per_page=5
         )
 
     def replies_of(self, comment_id):