HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

respect privacy settings in post search

Browse source
This commit is contained in:
naskya 2024-06-29 19:47:34 +09:00
parent fffca8af74
commit 1470d3e71d
No known key found for this signature in database
GPG key ID: 712D413B3A9FED5C
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/backend/src/server/api/mastodon/helpers/search.ts
View file

@ -19,6 +19,7 @@ import { createNote } from "@/remote/activitypub/models/note.js";
import { config } from "@/config.js"; import { config } from "@/config.js";
import { logger, type MastoContext } from "@/server/api/mastodon/index.js"; import { logger, type MastoContext } from "@/server/api/mastodon/index.js";
import { generateFtsQuery } from "@/server/api/common/generate-fts-query.js"; import { generateFtsQuery } from "@/server/api/common/generate-fts-query.js";
import note from "@/remote/activitypub/kernel/create/note";
export class SearchHelpers { export class SearchHelpers {
public static async search( public static async search(
@ -37,7 +38,6 @@ export class SearchHelpers {
if (q === undefined || q.trim().length === 0) if (q === undefined || q.trim().length === 0)
throw new Error("Search query cannot be empty"); throw new Error("Search query cannot be empty");
if (limit > 40) limit = 40; if (limit > 40) limit = 40;
const user = ctx.user as ILocalUser;
const notes = const notes =
type === "statuses" || !type type === "statuses" || !type
? this.searchNotes( ? this.searchNotes(
@ -233,7 +233,8 @@ export class SearchHelpers {
undefined, undefined,
minId, minId,
maxId, maxId,
); )
.andWhere("note.visibility = 'public'");
if (accountId) { if (accountId) {
query.andWhere("note.userId = :userId", { userId: accountId }); query.andWhere("note.userId = :userId", { userId: accountId });
@ -266,6 +267,10 @@ export class SearchHelpers {
query.setParameter("meId", user.id); query.setParameter("meId", user.id);
query
.innerJoinAndSelect("note.user", "user")
.andWhere("user.isIndexable = TRUE");
return query return query
.skip(offset ?? 0) .skip(offset ?? 0)
.take(limit) .take(limit)
@ -275,7 +280,7 @@ export class SearchHelpers {
private static async searchTags( private static async searchTags(
q: string, q: string,
excludeUnreviewed: boolean, _excludeUnreviewed: boolean,
limit: number, limit: number,
offset: number | undefined, offset: number | undefined,
): Promise<MastodonEntity.Tag[]> { ): Promise<MastodonEntity.Tag[]> {