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

[backend/masto-client] Fix reblog with visibility

Browse source
This commit is contained in:
Laura Hausmann 2024-04-28 00:57:01 +02:00
parent 94ac11db88
commit 128b0182fd
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Iceshrimp.Backend/Controllers/Mastodon/Schemas/StatusSchemas.cs
View file

@ -94,4 +94,9 @@ public abstract class StatusSchemas
{ {
[JR] [J("id")] [B(Name = "id")] public required string Id { get; set; } [JR] [J("id")] [B(Name = "id")] public required string Id { get; set; }
} }
public class ReblogRequest
{
[B(Name = "visibility")] [J("visibility")] public string? Visibility { get; set; }
}
} }

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

@ -259,7 +259,7 @@ public class StatusController(
[Authorize("write:favourites")] [Authorize("write:favourites")]
[ProducesResponseType(StatusCodes.Status200OK, Type = typeof(StatusEntity))] [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(StatusEntity))]
[ProducesResponseType(StatusCodes.Status404NotFound, Type = typeof(MastodonErrorResponse))] [ProducesResponseType(StatusCodes.Status404NotFound, Type = typeof(MastodonErrorResponse))]
public async Task<IActionResult> Renote(string id, [FromHybrid] string? visibility) public async Task<IActionResult> Renote(string id, [FromHybrid] StatusSchemas.ReblogRequest? request)
{ {
var user = HttpContext.GetUserOrFail(); var user = HttpContext.GetUserOrFail();
if (!await db.Notes.AnyAsync(p => p.RenoteId == id && p.User == user && p.IsPureRenote)) if (!await db.Notes.AnyAsync(p => p.RenoteId == id && p.User == user && p.IsPureRenote))
@ -271,8 +271,8 @@ public class StatusController(
.FirstOrDefaultAsync() ?? .FirstOrDefaultAsync() ??
throw GracefulException.RecordNotFound(); throw GracefulException.RecordNotFound();
var renoteVisibility = visibility != null var renoteVisibility = request?.Visibility != null
? StatusEntity.DecodeVisibility(visibility) ? StatusEntity.DecodeVisibility(request.Visibility)
: Note.NoteVisibility.Followers; : Note.NoteVisibility.Followers;
if (renoteVisibility == Note.NoteVisibility.Specified) if (renoteVisibility == Note.NoteVisibility.Specified)