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

[backend/core] Fix note thread mute handling inconsistencies

Browse source
This commit is contained in:
Laura Hausmann 2024-08-13 03:11:09 +02:00
parent c556d6b701
commit 3132b6b8c9
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Iceshrimp.Backend/Controllers/Mastodon/Streaming/Channels/UserChannel.cs
View file

@ -175,7 +175,8 @@ public class UserChannel(WebSocketConnection connection, bool notificationsOnly)
if (IsFiltered(notification)) return;
await using var scope = connection.ScopeFactory.CreateAsyncScope();
if (notification.Note != null && await connection.IsMutedThread(notification.Note, scope)) return;
if (notification.Note != null && await connection.IsMutedThread(notification.Note, scope, true))
return;
var renderer = scope.ServiceProvider.GetRequiredService<NotificationRenderer>();

6
Iceshrimp.Backend/Controllers/Mastodon/Streaming/WebSocketConnection.cs
View file

@ -366,10 +366,10 @@ public sealed class WebSocketConnection(
(IsFiltered(note.Renote.Renote.User) ||
IsFilteredMentions(note.Renote.Renote.Mentions)));
public async Task<bool> IsMutedThread(Note note, AsyncServiceScope scope)
public async Task<bool> IsMutedThread(Note note, AsyncServiceScope scope, bool isNotification = false)
{
if (note.Reply == null) return false;
if (note.User.Id == Token.UserId) return false;
if (!isNotification && note.Reply == null) return false;
if (!isNotification && note.User.Id == Token.UserId) return false;
var db = scope.ServiceProvider.GetRequiredService<DatabaseContext>();
return await db.NoteThreadMutings.AnyAsync(p => p.UserId == Token.UserId && p.ThreadId == note.ThreadId);
}

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

@ -353,7 +353,8 @@ public static class QueryableExtensions
public static IQueryable<Note> FilterMutedThreads(this IQueryable<Note> query, User user, DatabaseContext db)
{
return query.Where(p => !db.NoteThreadMutings.Any(m => m.User == user && m.ThreadId == p.ThreadIdOrId));
return query.Where(p => p.User != user &&
!db.NoteThreadMutings.Any(m => m.User == user && m.ThreadId == p.ThreadIdOrId));
}
public static IQueryable<Notification> FilterMutedThreads(

11
Iceshrimp.Backend/SignalR/Helpers/StreamingConnectionAggregate.cs
View file

@ -73,7 +73,8 @@ public sealed class StreamingConnectionAggregate : IDisposable
if (notification.Notifier != null && IsFiltered(notification.Notifier)) return;
await using var scope = GetTempScope();
if (notification.Note != null && await IsMutedThread(notification.Note, scope)) return;
if (notification.Note != null && await IsMutedThread(notification.Note, scope, true))
return;
var renderer = scope.ServiceProvider.GetRequiredService<NotificationRenderer>();
var rendered = await renderer.RenderOne(notification, _user);
@ -171,12 +172,12 @@ public sealed class StreamingConnectionAggregate : IDisposable
return res is not { Note.IsPureRenote: true, Renote: null } ? res : null;
}
private async Task<bool> IsMutedThread(Note note, AsyncServiceScope scope)
private async Task<bool> IsMutedThread(Note note, AsyncServiceScope scope, bool isNotification = false)
{
if (note.Reply == null) return false;
if (note.User.Id == _userId) return false;
if (!isNotification && note.Reply == null) return false;
if (!isNotification && note.User.Id == _userId) return false;
var db = scope.ServiceProvider.GetRequiredService<DatabaseContext>();
return await db.NoteThreadMutings.AnyAsync(p => p.UserId == _userId && p.ThreadId == note.ThreadId);
return await db.NoteThreadMutings.AnyAsync(p => p.UserId == _userId && p.ThreadId == note.ThreadIdOrId);
}
[SuppressMessage("ReSharper", "SuggestBaseTypeForParameter")]