refactor: Rename function
This commit is contained in:
parent
a8adc46f3b
commit
1b9d316e7c
18 changed files with 36 additions and 36 deletions
|
|
@ -6,7 +6,7 @@ import { getUser } from '../../common/getters';
|
|||
import { makePaginationQuery } from '../../common/make-pagination-query';
|
||||
import { generateVisibilityQuery } from '../../common/generate-visibility-query';
|
||||
import { Notes } from '../../../../models';
|
||||
import { generateMuteQuery } from '../../common/generate-mute-query';
|
||||
import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
|
||||
import { Brackets } from 'typeorm';
|
||||
|
||||
export const meta = {
|
||||
|
|
@ -134,7 +134,7 @@ export default define(meta, async (ps, me) => {
|
|||
.leftJoinAndSelect('note.user', 'user');
|
||||
|
||||
generateVisibilityQuery(query, me);
|
||||
if (me) generateMuteQuery(query, me, user);
|
||||
if (me) generateMutedUserQuery(query, me, user);
|
||||
|
||||
if (ps.withFiles) {
|
||||
query.andWhere('note.fileIds != \'{}\'');
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import * as ms from 'ms';
|
|||
import $ from 'cafy';
|
||||
import define from '../../define';
|
||||
import { Users, Followings } from '../../../../models';
|
||||
import { generateMuteQueryForUsers } from '../../common/generate-mute-query';
|
||||
import { generateMutedUserQueryForUsers } from '../../common/generate-muted-user-query';
|
||||
import { generateBlockQueryForUsers } from '../../common/generate-block-query';
|
||||
|
||||
export const meta = {
|
||||
|
|
@ -47,7 +47,7 @@ export default define(meta, async (ps, me) => {
|
|||
.andWhere('user.id != :meId', { meId: me.id })
|
||||
.orderBy('user.followersCount', 'DESC');
|
||||
|
||||
generateMuteQueryForUsers(query, me);
|
||||
generateMutedUserQueryForUsers(query, me);
|
||||
generateBlockQueryForUsers(query, me);
|
||||
|
||||
const followingQuery = Followings.createQueryBuilder('following')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue