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

[backend/core] Generate reply notifications for notes that aren't of specified visibility

Browse source
This commit is contained in:
Laura Hausmann 2024-06-13 22:54:02 +02:00
parent b27572bf27
commit c4190781e3
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Iceshrimp.Backend/Core/Extensions/EnumerableExtensions.cs
View file

@ -43,4 +43,6 @@ public static class EnumerableExtensions
var yArray = y as T[] ?? y.ToArray(); var yArray = y as T[] ?? y.ToArray();
return xArray.Length == yArray.Length && xArray.All(yArray.Contains); return xArray.Length == yArray.Length && xArray.All(yArray.Contains);
} }
public static IEnumerable<T> NotNull<T>(this IEnumerable<T?> @enum) => @enum.OfType<T>();
} }

13
Iceshrimp.Backend/Core/Services/NotificationService.cs
View file

@ -1,6 +1,7 @@
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using Iceshrimp.Backend.Core.Database; using Iceshrimp.Backend.Core.Database;
using Iceshrimp.Backend.Core.Database.Tables; using Iceshrimp.Backend.Core.Database.Tables;
using Iceshrimp.Backend.Core.Extensions;
using Iceshrimp.Backend.Core.Helpers; using Iceshrimp.Backend.Core.Helpers;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
@ -42,14 +43,18 @@ public class NotificationService(
public async Task GenerateReplyNotifications(Note note, IReadOnlyCollection<string> mentionedLocalUserIds) public async Task GenerateReplyNotifications(Note note, IReadOnlyCollection<string> mentionedLocalUserIds)
{ {
if (note.Visibility != Note.NoteVisibility.Specified) return; var users = mentionedLocalUserIds
if (note.VisibleUserIds.Count == 0) return; .Concat(note.VisibleUserIds)
.Append(note.ReplyUserId)
.NotNull()
.Distinct()
.Except(mentionedLocalUserIds)
.ToList();
var users = mentionedLocalUserIds.Concat(note.VisibleUserIds).Distinct().Except(mentionedLocalUserIds).ToList();
if (users.Count == 0) return; if (users.Count == 0) return;
var blocks = await db.Blockings var blocks = await db.Blockings
.Where(p => p.BlockeeId == note.UserId && mentionedLocalUserIds.Contains(p.BlockerId)) .Where(p => p.BlockeeId == note.UserId && users.Contains(p.BlockerId))
.Select(p => p.BlockerId) .Select(p => p.BlockerId)
.ToListAsync(); .ToListAsync();