1

server/app/services/video_service.py

@@ -160,9 +160,37 @@ async def get_feed(
 ) -> dict:
     if feed_type == "latest":
         return await _feed_latest(db, identity, cursor, limit, category_id)
+    if feed_type in ("liked", "viewed"):
+        return await _feed_ranked(db, identity, feed_type, cursor, limit, category_id)
     return await _feed_scored(db, redis, identity, feed_type, cursor, limit, category_id)
 
 
+async def _feed_ranked(
+    db: AsyncSession, identity: Identity, feed_type: str, cursor: str | None,
+    limit: int, category_id: int | None,
+) -> dict:
+    """liked / viewed：按点赞量 / 播放量严格倒序（值 + id 打破并列游标）"""
+    col = Video.like_count if feed_type == "liked" else Video.view_count
+    stmt = await _base_pool_stmt(category_id)
+    c = _decode_cursor(cursor)
+    if c:
+        val, vid = int(c["n"]), int(c["i"])
+        stmt = stmt.where((col < val) | ((col == val) & (Video.id < vid)))
+    rows = list(
+        (await db.execute(stmt.order_by(col.desc(), Video.id.desc()).limit(limit + 1))).scalars()
+    )
+    page, rows = (len(rows) > limit), rows[:limit]
+    next_cursor = None
+    if page and rows:
+        last = rows[-1]
+        last_val = last.like_count if feed_type == "liked" else last.view_count
+        next_cursor = _encode_cursor({"n": last_val, "i": last.id})
+    return {
+        "next_cursor": next_cursor,
+        "list": await serialize_videos(db, rows, identity.user_id),
+    }
+
+
 async def _base_pool_stmt(category_id: int | None):
     stmt = select(Video).where(Video.status == STATUS_PUBLISHED, Video.published_at.isnot(None))
     if category_id: