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

[backend/federation] Don't mark notes as edited during refetch (ISH-601)

Browse source
This commit is contained in:
Laura Hausmann 2025-01-07 07:02:32 +01:00
parent 1ecd823cbe
commit 2fbff537a6
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Iceshrimp.Backend/Core/Services/NoteService.cs
View file

@ -88,6 +88,7 @@ public class NoteService(
public NoteMentionData? ResolvedMentions; public NoteMentionData? ResolvedMentions;
public ASNote? ASNote; public ASNote? ASNote;
public List<string>? Emoji; public List<string>? Emoji;
public bool IsRefetch;
} }
public record struct NoteMentionData( public record struct NoteMentionData(
@ -750,6 +751,9 @@ public class NoteService(
|| isPollEdited || isPollEdited
|| db.Entry(note).State != EntityState.Unchanged; || db.Entry(note).State != EntityState.Unchanged;
if (isEdit && data.IsRefetch && note.UpdatedAt == data.UpdatedAt)
isEdit = false;
if (isEdit) if (isEdit)
{ {
note.UpdatedAt = data.UpdatedAt ?? DateTime.UtcNow; note.UpdatedAt = data.UpdatedAt ?? DateTime.UtcNow;
@ -1066,7 +1070,7 @@ public class NoteService(
[SuppressMessage("ReSharper", "EntityFramework.NPlusOne.IncompleteDataUsage", [SuppressMessage("ReSharper", "EntityFramework.NPlusOne.IncompleteDataUsage",
Justification = "Inspection doesn't understand IncludeCommonProperties()")] Justification = "Inspection doesn't understand IncludeCommonProperties()")]
[SuppressMessage("ReSharper", "EntityFramework.NPlusOne.IncompleteDataQuery", Justification = "See above")] [SuppressMessage("ReSharper", "EntityFramework.NPlusOne.IncompleteDataQuery", Justification = "See above")]
public async Task<Note?> ProcessNoteUpdateAsync(ASNote note, User actor, User? user = null) public async Task<Note?> ProcessNoteUpdateAsync(ASNote note, User actor, User? user = null, bool isRefetch = false)
{ {
var dbNote = await db.Notes.IncludeCommonProperties() var dbNote = await db.Notes.IncludeCommonProperties()
.Include(p => p.Poll) .Include(p => p.Poll)
@ -1140,7 +1144,8 @@ public class NoteService(
UpdatedAt = updatedAt, UpdatedAt = updatedAt,
ResolvedMentions = mentionData, ResolvedMentions = mentionData,
ASNote = note, ASNote = note,
Emoji = emoji Emoji = emoji,
IsRefetch = isRefetch
}); });
} }
@ -1370,7 +1375,7 @@ public class NoteService(
try try
{ {
return forceRefresh return forceRefresh
? await ProcessNoteUpdateAsync(fetchedNote, actor, user) ? await ProcessNoteUpdateAsync(fetchedNote, actor, user, isRefetch: true)
: await ProcessNoteAsync(fetchedNote, actor, user); : await ProcessNoteAsync(fetchedNote, actor, user);
} }
catch (Exception e) catch (Exception e)