refactor: Rename function
This commit is contained in:
parent
a8adc46f3b
commit
1b9d316e7c
18 changed files with 36 additions and 36 deletions
|
|
@ -3,7 +3,7 @@ import { ID } from '../../../../misc/cafy-id';
|
|||
import define from '../../define';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query';
|
||||
import { generateVisibilityQuery } from '../../common/generate-visibility-query';
|
||||
import { generateMuteQuery } from '../../common/generate-mute-query';
|
||||
import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
|
||||
import { Brackets } from 'typeorm';
|
||||
import { Notes } from '../../../../models';
|
||||
|
||||
|
|
@ -67,7 +67,7 @@ export default define(meta, async (ps, user) => {
|
|||
.leftJoinAndSelect('note.user', 'user');
|
||||
|
||||
generateVisibilityQuery(query, user);
|
||||
if (user) generateMuteQuery(query, user);
|
||||
if (user) generateMutedUserQuery(query, user);
|
||||
|
||||
const notes = await query.take(ps.limit!).getMany();
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import $ from 'cafy';
|
||||
import define from '../../define';
|
||||
import { generateMuteQuery } from '../../common/generate-mute-query';
|
||||
import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
|
||||
import { Notes } from '../../../../models';
|
||||
|
||||
export const meta = {
|
||||
|
|
@ -51,7 +51,7 @@ export default define(meta, async (ps, user) => {
|
|||
.andWhere(`note.visibility = 'public'`)
|
||||
.leftJoinAndSelect('note.user', 'user');
|
||||
|
||||
if (user) generateMuteQuery(query, user);
|
||||
if (user) generateMutedUserQuery(query, user);
|
||||
|
||||
let notes = await query
|
||||
.orderBy('note.score', 'DESC')
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import { fetchMeta } from '../../../../misc/fetch-meta';
|
|||
import { ApiError } from '../../error';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query';
|
||||
import { Notes } from '../../../../models';
|
||||
import { generateMuteQuery } from '../../common/generate-mute-query';
|
||||
import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
|
||||
import { activeUsersChart } from '../../../../services/chart';
|
||||
import { generateRepliesQuery } from '../../common/generate-replies-query';
|
||||
import { injectPromo } from '../../common/inject-promo';
|
||||
|
|
@ -83,7 +83,7 @@ export default define(meta, async (ps, user) => {
|
|||
.leftJoinAndSelect('note.user', 'user');
|
||||
|
||||
generateRepliesQuery(query, user);
|
||||
if (user) generateMuteQuery(query, user);
|
||||
if (user) generateMutedUserQuery(query, user);
|
||||
if (user) generateMutedNoteQuery(query, user);
|
||||
|
||||
if (ps.withFiles) {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
|
|||
import { Followings, Notes } from '../../../../models';
|
||||
import { Brackets } from 'typeorm';
|
||||
import { generateVisibilityQuery } from '../../common/generate-visibility-query';
|
||||
import { generateMuteQuery } from '../../common/generate-mute-query';
|
||||
import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
|
||||
import { activeUsersChart } from '../../../../services/chart';
|
||||
import { generateRepliesQuery } from '../../common/generate-replies-query';
|
||||
import { injectPromo } from '../../common/inject-promo';
|
||||
|
|
@ -133,7 +133,7 @@ export default define(meta, async (ps, user) => {
|
|||
|
||||
generateRepliesQuery(query, user);
|
||||
generateVisibilityQuery(query, user);
|
||||
generateMuteQuery(query, user);
|
||||
generateMutedUserQuery(query, user);
|
||||
generateMutedNoteQuery(query, user);
|
||||
|
||||
if (ps.includeMyRenotes === false) {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import define from '../../define';
|
|||
import { fetchMeta } from '../../../../misc/fetch-meta';
|
||||
import { ApiError } from '../../error';
|
||||
import { Notes } from '../../../../models';
|
||||
import { generateMuteQuery } from '../../common/generate-mute-query';
|
||||
import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query';
|
||||
import { generateVisibilityQuery } from '../../common/generate-visibility-query';
|
||||
import { activeUsersChart } from '../../../../services/chart';
|
||||
|
|
@ -101,7 +101,7 @@ export default define(meta, async (ps, user) => {
|
|||
|
||||
generateRepliesQuery(query, user);
|
||||
generateVisibilityQuery(query, user);
|
||||
if (user) generateMuteQuery(query, user);
|
||||
if (user) generateMutedUserQuery(query, user);
|
||||
if (user) generateMutedNoteQuery(query, user);
|
||||
|
||||
if (ps.withFiles) {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import define from '../../define';
|
|||
import read from '../../../../services/note/read';
|
||||
import { Notes, Followings } from '../../../../models';
|
||||
import { generateVisibilityQuery } from '../../common/generate-visibility-query';
|
||||
import { generateMuteQuery } from '../../common/generate-mute-query';
|
||||
import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query';
|
||||
import { Brackets } from 'typeorm';
|
||||
|
||||
|
|
@ -66,7 +66,7 @@ export default define(meta, async (ps, user) => {
|
|||
.leftJoinAndSelect('note.user', 'user');
|
||||
|
||||
generateVisibilityQuery(query, user);
|
||||
generateMuteQuery(query, user);
|
||||
generateMutedUserQuery(query, user);
|
||||
|
||||
if (ps.visibility) {
|
||||
query.andWhere('note.visibility = :visibility', { visibility: ps.visibility });
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import define from '../../define';
|
|||
import { getNote } from '../../common/getters';
|
||||
import { ApiError } from '../../error';
|
||||
import { generateVisibilityQuery } from '../../common/generate-visibility-query';
|
||||
import { generateMuteQuery } from '../../common/generate-mute-query';
|
||||
import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query';
|
||||
import { Notes } from '../../../../models';
|
||||
|
||||
|
|
@ -71,7 +71,7 @@ export default define(meta, async (ps, user) => {
|
|||
.leftJoinAndSelect('note.user', 'user');
|
||||
|
||||
generateVisibilityQuery(query, user);
|
||||
if (user) generateMuteQuery(query, user);
|
||||
if (user) generateMutedUserQuery(query, user);
|
||||
|
||||
const renotes = await query.take(ps.limit!).getMany();
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import define from '../../define';
|
|||
import { Notes } from '../../../../models';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query';
|
||||
import { generateVisibilityQuery } from '../../common/generate-visibility-query';
|
||||
import { generateMuteQuery } from '../../common/generate-mute-query';
|
||||
import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
|
||||
|
||||
export const meta = {
|
||||
desc: {
|
||||
|
|
@ -62,7 +62,7 @@ export default define(meta, async (ps, user) => {
|
|||
.leftJoinAndSelect('note.user', 'user');
|
||||
|
||||
generateVisibilityQuery(query, user);
|
||||
if (user) generateMuteQuery(query, user);
|
||||
if (user) generateMutedUserQuery(query, user);
|
||||
|
||||
const timeline = await query.take(ps.limit!).getMany();
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import { ID } from '../../../../misc/cafy-id';
|
|||
import define from '../../define';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query';
|
||||
import { Notes } from '../../../../models';
|
||||
import { generateMuteQuery } from '../../common/generate-mute-query';
|
||||
import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
|
||||
import { generateVisibilityQuery } from '../../common/generate-visibility-query';
|
||||
import { Brackets } from 'typeorm';
|
||||
import { safeForSql } from '../../../../misc/safe-for-sql';
|
||||
|
|
@ -97,7 +97,7 @@ export default define(meta, async (ps, me) => {
|
|||
.leftJoinAndSelect('note.user', 'user');
|
||||
|
||||
generateVisibilityQuery(query, me);
|
||||
if (me) generateMuteQuery(query, me);
|
||||
if (me) generateMutedUserQuery(query, me);
|
||||
|
||||
if (ps.tag) {
|
||||
if (!safeForSql(ps.tag)) return;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import { ID } from '../../../../misc/cafy-id';
|
|||
import config from '../../../../config';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query';
|
||||
import { generateVisibilityQuery } from '../../common/generate-visibility-query';
|
||||
import { generateMuteQuery } from '../../common/generate-mute-query';
|
||||
import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
|
||||
|
||||
export const meta = {
|
||||
desc: {
|
||||
|
|
@ -69,7 +69,7 @@ export default define(meta, async (ps, me) => {
|
|||
.leftJoinAndSelect('note.user', 'user');
|
||||
|
||||
generateVisibilityQuery(query, me);
|
||||
if (me) generateMuteQuery(query, me);
|
||||
if (me) generateMutedUserQuery(query, me);
|
||||
|
||||
const notes = await query.take(ps.limit!).getMany();
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import define from '../../define';
|
|||
import { makePaginationQuery } from '../../common/make-pagination-query';
|
||||
import { Notes, Followings } from '../../../../models';
|
||||
import { generateVisibilityQuery } from '../../common/generate-visibility-query';
|
||||
import { generateMuteQuery } from '../../common/generate-mute-query';
|
||||
import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
|
||||
import { activeUsersChart } from '../../../../services/chart';
|
||||
import { Brackets } from 'typeorm';
|
||||
import { generateRepliesQuery } from '../../common/generate-replies-query';
|
||||
|
|
@ -126,7 +126,7 @@ export default define(meta, async (ps, user) => {
|
|||
|
||||
generateRepliesQuery(query, user);
|
||||
generateVisibilityQuery(query, user);
|
||||
generateMuteQuery(query, user);
|
||||
generateMutedUserQuery(query, user);
|
||||
generateMutedNoteQuery(query, user);
|
||||
|
||||
if (ps.includeMyRenotes === false) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue