summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2024-10-09 17:19:50 +0100
committerdakkar <dakkar@thenautilus.net>2024-10-09 17:19:50 +0100
commit43bdae4cc4252fc137f609fe507fea056c9e2284 (patch)
treeb88e6525f060b4b8bd88aca15bc2df13c8ab3717 /packages/backend/src/server/api
parentuse injected meta in MastodonApiServerService (diff)
downloadsharkey-43bdae4cc4252fc137f609fe507fea056c9e2284.tar.gz
sharkey-43bdae4cc4252fc137f609fe507fea056c9e2284.tar.bz2
sharkey-43bdae4cc4252fc137f609fe507fea056c9e2284.zip
use injected meta in search-by-tag
Diffstat (limited to 'packages/backend/src/server/api')
-rw-r--r--packages/backend/src/server/api/endpoints/notes/search-by-tag.ts11
1 files changed, 6 insertions, 5 deletions
diff --git a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
index e90fb07a87..8101a205a6 100644
--- a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
@@ -5,7 +5,7 @@
import { Brackets } from 'typeorm';
import { Inject, Injectable } from '@nestjs/common';
-import type { NotesRepository } from '@/models/_.js';
+import type { NotesRepository, MiMeta } from '@/models/_.js';
import { safeForSql } from '@/misc/safe-for-sql.js';
import { normalizeForSearch } from '@/misc/normalize-for-search.js';
import { Endpoint } from '@/server/api/endpoint-base.js';
@@ -69,6 +69,9 @@ export const paramDef = {
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
constructor(
+ @Inject(DI.meta)
+ private serverSettings: MiMeta,
+
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
@@ -79,8 +82,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
private utilityService: UtilityService,
) {
super(meta, paramDef, async (ps, me) => {
- const meta = await this.metaService.fetch(true);
-
const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
.andWhere('note.visibility = \'public\'')
.innerJoinAndSelect('note.user', 'user')
@@ -89,7 +90,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
.leftJoinAndSelect('reply.user', 'replyUser')
.leftJoinAndSelect('renote.user', 'renoteUser');
- if (!meta.enableBotTrending) query.andWhere('user.isBot = FALSE');
+ if (!this.serverSettings.enableBotTrending) query.andWhere('user.isBot = FALSE');
this.queryService.generateVisibilityQuery(query, me);
if (me) this.queryService.generateMutedUserQuery(query, me);
@@ -157,7 +158,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
if (note.user?.isSilenced && me && followings && note.userId !== me.id && !followings[note.userId]) return false;
if (note.user?.isSuspended) return false;
if (this.utilityService.isFederationAllowedHost(note.userHost)) return false;
- if (this.utilityService.isSilencedHost(meta.silencedHosts, note.userHost)) return false;
+ if (this.utilityService.isSilencedHost(this.serverSettings.silencedHosts, note.userHost)) return false;
return true;
});