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

[backend/masto-client] Respect account_id query parameter when searching for notes

Browse source
This commit is contained in:
Laura Hausmann 2024-02-08 01:09:58 +01:00
parent ce47377001
commit faee1e01dc
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Iceshrimp.Backend/Controllers/Mastodon/SearchController.cs
View file

@ -137,6 +137,7 @@ public class SearchController(
.IncludeCommonProperties() .IncludeCommonProperties()
.Where(p => p.TextContainsCaseInsensitive(search.Query!) && .Where(p => p.TextContainsCaseInsensitive(search.Query!) &&
(!search.Following || p.User.IsFollowedBy(user))) (!search.Following || p.User.IsFollowedBy(user)))
.FilterByUser(search.UserId)
.EnsureVisibleFor(user) .EnsureVisibleFor(user)
.FilterHiddenListMembers(user) .FilterHiddenListMembers(user)
.FilterBlocked(user) .FilterBlocked(user)

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

@ -80,8 +80,8 @@ public static class NoteQueryableExtensions {
return query.Where(note => note.User == user); return query.Where(note => note.User == user);
} }
public static IQueryable<Note> FilterByUser(this IQueryable<Note> query, string userId) { public static IQueryable<Note> FilterByUser(this IQueryable<Note> query, string? userId) {
return query.Where(note => note.UserId == userId); return userId != null ? query.Where(note => note.UserId == userId) : query;
} }
public static IQueryable<Note> EnsureVisibleFor(this IQueryable<Note> query, User? user) { public static IQueryable<Note> EnsureVisibleFor(this IQueryable<Note> query, User? user) {