From 0aa43ef4c6724f672453676a0c688cd80097dad7 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sat, 9 Apr 2022 18:53:52 +0800
Subject: ...

---
 BackEnd/Timeline/Controllers/TimelinePostV2Controller.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'BackEnd/Timeline/Controllers')

diff --git a/BackEnd/Timeline/Controllers/TimelinePostV2Controller.cs b/BackEnd/Timeline/Controllers/TimelinePostV2Controller.cs
index af1b3182..3a694e31 100644
--- a/BackEnd/Timeline/Controllers/TimelinePostV2Controller.cs
+++ b/BackEnd/Timeline/Controllers/TimelinePostV2Controller.cs
@@ -44,22 +44,23 @@ namespace Timeline.Controllers
         [ProducesResponseType(StatusCodes.Status403Forbidden)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
-        public async Task<ActionResult<List<HttpTimelinePost>>> ListAsync([FromRoute][Username] string owner, [FromRoute][TimelineName] string timeline, [FromQuery] DateTime? modifiedSince, [FromQuery] bool? includeDeleted, [FromQuery][Range(0, int.MaxValue)] int? page, [FromQuery][Range(1, int.MaxValue)] int? numberPerPage)
+        public async Task<ActionResult<Page<HttpTimelinePost>>> ListAsync([FromRoute][Username] string owner, [FromRoute][TimelineName] string timeline, [FromQuery] DateTime? modifiedSince, [FromQuery][Range(0, int.MaxValue)] int? page, [FromQuery][Range(1, int.MaxValue)] int? numberPerPage)
         {
             var timelineId = await _timelineService.GetTimelineIdAsync(owner, timeline);
             if (!UserHasPermission(UserPermission.AllTimelineManagement) && !await _timelineService.HasReadPermissionAsync(timelineId, GetOptionalAuthUserId()))
             {
                 return Forbid();
             }
-            var posts = await _postService.GetPostsAsync(timelineId, modifiedSince, includeDeleted ?? false, page, numberPerPage);
-            var result = await _mapper.MapListAsync<HttpTimelinePost>(posts, Url, User);
-            return result;
+            var postPage = await _postService.GetPostsV2Async(timelineId, modifiedSince, page, numberPerPage);
+            var items = await _mapper.MapListAsync<HttpTimelinePost>(postPage.Items, Url, User);
+            return postPage.WithItems(items);
         }
 
         [HttpGet("{post}")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status403Forbidden)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesResponseType(StatusCodes.Status410Gone)]
         [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
         public async Task<ActionResult<HttpTimelinePost>> GetAsync([FromRoute][Username] string owner, [FromRoute][TimelineName] string timeline, [FromRoute(Name = "post")] long postId)
         {
@@ -68,7 +69,7 @@ namespace Timeline.Controllers
             {
                 return Forbid();
             }
-            var post = await _postService.GetPostAsync(timelineId, postId);
+            var post = await _postService.GetPostV2Async(timelineId, postId);
             var result = await _mapper.MapAsync<HttpTimelinePost>(post, Url, User);
             return result;
         }
-- 
cgit v1.2.3