notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/masto-client] Rename PaginationQuery to MastodonPaginationQuery

Browse source
This commit is contained in:
Laura Hausmann 2024-02-18 01:38:37 +01:00
parent f36ea57cb4
commit dfa47f2a12
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
7 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Iceshrimp.Backend/Controllers/Attributes/LinkPaginationAttribute.cs
View file

@ -26,7 +26,7 @@ public class LinkPaginationAttribute(int defaultLimit, int maxLimit) : ActionFil
{
if (actionArguments.Count == 0) return;
var query = actionArguments.Values.OfType<PaginationQuery>().FirstOrDefault();
var query = actionArguments.Values.OfType<MastodonPaginationQuery>().FirstOrDefault();
if (query == null) return;
if (context.Result is not OkObjectResult result) return;

8
Iceshrimp.Backend/Controllers/Mastodon/AccountController.cs
View file

@ -279,7 +279,7 @@ public class AccountController(
[ProducesResponseType(StatusCodes.Status403Forbidden, Type = typeof(MastodonErrorResponse))]
public async Task<IActionResult> GetUserStatuses(
string id, AccountSchemas.AccountStatusesRequest request,
PaginationQuery query
MastodonPaginationQuery query
)
{
var user = HttpContext.GetUserOrFail();
@ -302,7 +302,7 @@ public class AccountController(
[LinkPagination(40, 80)]
[ProducesResponseType(StatusCodes.Status200OK, Type = typeof(IEnumerable<AccountEntity>))]
[ProducesResponseType(StatusCodes.Status404NotFound, Type = typeof(MastodonErrorResponse))]
public async Task<IActionResult> GetUserFollowers(string id, PaginationQuery query)
public async Task<IActionResult> GetUserFollowers(string id, MastodonPaginationQuery query)
{
var user = HttpContext.GetUser();
var account = await db.Users
@ -334,7 +334,7 @@ public class AccountController(
[LinkPagination(40, 80)]
[ProducesResponseType(StatusCodes.Status200OK, Type = typeof(IEnumerable<AccountEntity>))]
[ProducesResponseType(StatusCodes.Status404NotFound, Type = typeof(MastodonErrorResponse))]
public async Task<IActionResult> GetUserFollowing(string id, PaginationQuery query)
public async Task<IActionResult> GetUserFollowing(string id, MastodonPaginationQuery query)
{
var user = HttpContext.GetUser();
var account = await db.Users
@ -367,7 +367,7 @@ public class AccountController(
[ProducesResponseType(StatusCodes.Status200OK, Type = typeof(IEnumerable<AccountEntity>))]
[ProducesResponseType(StatusCodes.Status401Unauthorized, Type = typeof(MastodonErrorResponse))]
[ProducesResponseType(StatusCodes.Status403Forbidden, Type = typeof(MastodonErrorResponse))]
public async Task<IActionResult> GetFollowRequests(PaginationQuery query)
public async Task<IActionResult> GetFollowRequests(MastodonPaginationQuery query)
{
var user = HttpContext.GetUserOrFail();
var res = await db.FollowRequests

2
Iceshrimp.Backend/Controllers/Mastodon/NotificationController.cs
View file

@ -27,7 +27,7 @@ public class NotificationController(DatabaseContext db, NotificationRenderer not
[Produces("application/json")]
[ProducesResponseType(StatusCodes.Status200OK, Type = typeof(List<NotificationEntity>))]
[ProducesResponseType(StatusCodes.Status404NotFound, Type = typeof(MastodonErrorResponse))]
public async Task<IActionResult> GetNotifications(PaginationQuery query)
public async Task<IActionResult> GetNotifications(MastodonPaginationQuery query)
{
var user = HttpContext.GetUserOrFail();
var res = await db.Notifications

2
Iceshrimp.Backend/Controllers/Mastodon/Schemas/PaginationQuery.cs → Iceshrimp.Backend/Controllers/Mastodon/Schemas/MastodonPaginationQuery.cs
View file

@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc;
namespace Iceshrimp.Backend.Controllers.Mastodon.Schemas;
public class PaginationQuery
public class MastodonPaginationQuery
{
[FromQuery(Name = "max_id")] public string? MaxId { get; set; }
[FromQuery(Name = "since_id")] public string? SinceId { get; set; }

6
Iceshrimp.Backend/Controllers/Mastodon/SearchController.cs
View file

@ -35,7 +35,7 @@ public class SearchController(
[Produces("application/json")]
[ProducesResponseType(StatusCodes.Status200OK, Type = typeof(SearchSchemas.SearchResponse))]
[ProducesResponseType(StatusCodes.Status404NotFound, Type = typeof(MastodonErrorResponse))]
public async Task<IActionResult> Search(SearchSchemas.SearchRequest search, PaginationQuery pagination)
public async Task<IActionResult> Search(SearchSchemas.SearchRequest search, MastodonPaginationQuery pagination)
{
if (search.Query == null)
throw GracefulException.BadRequest("Query is missing or invalid");
@ -54,7 +54,7 @@ public class SearchController(
Justification = "Inspection doesn't know about the Projectable attribute")]
private async Task<List<AccountEntity>> SearchUsersAsync(
SearchSchemas.SearchRequest search,
PaginationQuery pagination
MastodonPaginationQuery pagination
)
{
var user = HttpContext.GetUserOrFail();
@ -122,7 +122,7 @@ public class SearchController(
Justification = "Inspection doesn't know about the Projectable attribute")]
private async Task<List<StatusEntity>> SearchNotesAsync(
SearchSchemas.SearchRequest search,
PaginationQuery pagination
MastodonPaginationQuery pagination
)
{
var user = HttpContext.GetUserOrFail();

4
Iceshrimp.Backend/Controllers/Mastodon/TimelineController.cs
View file

@ -29,7 +29,7 @@ public class TimelineController(DatabaseContext db, NoteRenderer noteRenderer, I
[HttpGet("home")]
[Produces("application/json")]
[ProducesResponseType(StatusCodes.Status200OK, Type = typeof(IEnumerable<StatusEntity>))]
public async Task<IActionResult> GetHomeTimeline(PaginationQuery query)
public async Task<IActionResult> GetHomeTimeline(MastodonPaginationQuery query)
{
var user = HttpContext.GetUserOrFail();
var heuristic = await QueryableExtensions.GetHeuristic(user, db, cache);
@ -52,7 +52,7 @@ public class TimelineController(DatabaseContext db, NoteRenderer noteRenderer, I
[HttpGet("public")]
[Produces("application/json")]
[ProducesResponseType(StatusCodes.Status200OK, Type = typeof(IEnumerable<StatusEntity>))]
public async Task<IActionResult> GetPublicTimeline(PaginationQuery query)
public async Task<IActionResult> GetPublicTimeline(MastodonPaginationQuery query)
{
var user = HttpContext.GetUserOrFail();

2
Iceshrimp.Backend/Core/Extensions/QueryableExtensions.cs
View file

@ -17,7 +17,7 @@ public static class QueryableExtensions
{
public static IQueryable<T> Paginate<T>(
this IQueryable<T> query,
PaginationQuery pq,
MastodonPaginationQuery pq,
int defaultLimit,
int maxLimit
) where T : IEntity