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

[backend/masto-client] Fix invalid quotes on note create

Browse source
This commit is contained in:
Laura Hausmann 2024-02-22 03:10:07 +01:00
parent 21527547a2
commit e14686ea8c
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -219,12 +219,15 @@ public class StatusController(
var lastToken = request.Text?.Split(' ').LastOrDefault(); var lastToken = request.Text?.Split(' ').LastOrDefault();
var quoteUri = lastToken?.StartsWith("https://") ?? false ? lastToken : null; var quoteUri = lastToken?.StartsWith("https://") ?? false ? lastToken : null;
var quote = lastToken?.StartsWith($"https://{config.Value.WebDomain}/notes/") ?? false var quote = quoteUri != null
? lastToken?.StartsWith($"https://{config.Value.WebDomain}/notes/") ?? false
? await db.Notes.IncludeCommonProperties() ? await db.Notes.IncludeCommonProperties()
.FirstOrDefaultAsync(p => p.Id == .FirstOrDefaultAsync(p => p.Id ==
lastToken.Substring($"https://{config.Value.WebDomain}/notes/".Length)) lastToken.Substring($"https://{config.Value.WebDomain}/notes/"
.Length))
: await db.Notes.IncludeCommonProperties() : await db.Notes.IncludeCommonProperties()
.FirstOrDefaultAsync(p => p.Uri == quoteUri || p.Url == quoteUri); .FirstOrDefaultAsync(p => p.Uri == quoteUri || p.Url == quoteUri)
: null;
if (quote != null && quoteUri != null && request.Text != null) if (quote != null && quoteUri != null && request.Text != null)
request.Text = request.Text[..(request.Text.Length - quoteUri.Length - 1)]; request.Text = request.Text[..(request.Text.Length - quoteUri.Length - 1)];