summaryrefslogtreecommitdiff
path: root/src/server/api/common
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-07-28 09:38:41 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-07-28 09:38:41 +0900
commit1b9d316e7c2446211f4b5b6ec27dce0d9b4f0968 (patch)
treeb5f3a09e8c7649b19d9d1394f32a65fa432f92f5 /src/server/api/common
parentrefactor: Rename function (diff)
downloadsharkey-1b9d316e7c2446211f4b5b6ec27dce0d9b4f0968.tar.gz
sharkey-1b9d316e7c2446211f4b5b6ec27dce0d9b4f0968.tar.bz2
sharkey-1b9d316e7c2446211f4b5b6ec27dce0d9b4f0968.zip
refactor: Rename function
Diffstat (limited to 'src/server/api/common')
-rw-r--r--src/server/api/common/generate-muted-user-query.ts (renamed from src/server/api/common/generate-mute-query.ts)4
-rw-r--r--src/server/api/common/inject-featured.ts4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/api/common/generate-mute-query.ts b/src/server/api/common/generate-muted-user-query.ts
index 4504d23512..b346f2f0fb 100644
--- a/src/server/api/common/generate-mute-query.ts
+++ b/src/server/api/common/generate-muted-user-query.ts
@@ -2,7 +2,7 @@ import { User } from '../../../models/entities/user';
import { Mutings } from '../../../models';
import { SelectQueryBuilder, Brackets } from 'typeorm';
-export function generateMuteQuery(q: SelectQueryBuilder<any>, me: User, exclude?: User) {
+export function generateMutedUserQuery(q: SelectQueryBuilder<any>, me: User, exclude?: User) {
const mutingQuery = Mutings.createQueryBuilder('muting')
.select('muting.muteeId')
.where('muting.muterId = :muterId', { muterId: me.id });
@@ -28,7 +28,7 @@ export function generateMuteQuery(q: SelectQueryBuilder<any>, me: User, exclude?
q.setParameters(mutingQuery.getParameters());
}
-export function generateMuteQueryForUsers(q: SelectQueryBuilder<any>, me: User) {
+export function generateMutedUserQueryForUsers(q: SelectQueryBuilder<any>, me: User) {
const mutingQuery = Mutings.createQueryBuilder('muting')
.select('muting.muteeId')
.where('muting.muterId = :muterId', { muterId: me.id });
diff --git a/src/server/api/common/inject-featured.ts b/src/server/api/common/inject-featured.ts
index 92e1e3b396..098d20e72d 100644
--- a/src/server/api/common/inject-featured.ts
+++ b/src/server/api/common/inject-featured.ts
@@ -2,7 +2,7 @@ import rndstr from 'rndstr';
import { Note } from '../../../models/entities/note';
import { User } from '../../../models/entities/user';
import { Notes, UserProfiles, NoteReactions } from '../../../models';
-import { generateMuteQuery } from './generate-mute-query';
+import { generateMutedUserQuery } from './generate-muted-user-query';
import { ensure } from '../../../prelude/ensure';
// TODO: リアクション、Renote、返信などをしたノートは除外する
@@ -29,7 +29,7 @@ export async function injectFeatured(timeline: Note[], user?: User | null) {
if (user) {
query.andWhere('note.userId != :userId', { userId: user.id });
- generateMuteQuery(query, user);
+ generateMutedUserQuery(query, user);
const reactionQuery = NoteReactions.createQueryBuilder('reaction')
.select('reaction.noteId')