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

[backend/masto-client] Always send text property on status entities (ISH-323)

Browse source
This commit is contained in:
Laura Hausmann 2024-05-15 13:11:17 +02:00
parent c266cab4a6
commit 2c7490a304
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Iceshrimp.Backend/Controllers/Mastodon/Renderers/NoteRenderer.cs
View file

@ -125,7 +125,7 @@ public class NoteRenderer(
ContentWarning = note.Cw ?? "",
Visibility = StatusEntity.EncodeVisibility(note.Visibility),
Content = content,
Text = data?.Source == true ? text : null,
Text = text,
Mentions = mentions,
IsPinned = pinned,
Attachments = attachments,

9
Iceshrimp.Backend/Controllers/Mastodon/Schemas/Entities/StatusEntity.cs
View file

@ -9,6 +9,8 @@ namespace Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
public class StatusEntity : IEntity, ICloneable
{
[J("id")] public required string Id { get; set; }
[J("text")] public required string? Text { get; set; }
[J("content")] public required string? Content { get; set; }
[J("uri")] public required string Uri { get; set; }
[J("url")] public required string Url { get; set; }
@ -32,10 +34,6 @@ public class StatusEntity : IEntity, ICloneable
[J("spoiler_text")] public required string ContentWarning { get; set; }
[J("visibility")] public required string Visibility { get; set; }
[J("text")]
[JI(Condition = JsonIgnoreCondition.WhenWritingNull)]
public required string? Text { get; set; }
[J("pinned")]
[JI(Condition = JsonIgnoreCondition.WhenWritingNull)]
public required bool? IsPinned { get; set; }
@ -52,8 +50,7 @@ public class StatusEntity : IEntity, ICloneable
[J("card")] public object? Card => null; //FIXME
[J("application")] public object? Application => null; //FIXME
[J("language")] public string? Language => null; //FIXME
[J("id")] public required string Id { get; set; }
[J("language")] public string? Language => null; //FIXME
[JI] public string? MastoReplyUserId;