usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into swn

This commit is contained in:
tamaina 2021-08-20 21:06:53 +09:00
parent 997107287f 1ffee15b83
commit eb68ce2525
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/api/endpoints/users.ts
View File

@ -2,7 +2,7 @@ import $ from 'cafy';
import define from '../define'; import define from '../define';
import { Users } from '@/models/index'; import { Users } from '@/models/index';
import { generateMutedUserQueryForUsers } from '../common/generate-muted-user-query'; import { generateMutedUserQueryForUsers } from '../common/generate-muted-user-query';
import { generateBlockedUserQuery } from '../common/generate-block-query'; import { generateBlockQueryForUsers } from '../common/generate-block-query';
export const meta = { export const meta = {
tags: ['users'], tags: ['users'],
@ -90,7 +90,7 @@ export default define(meta, async (ps, me) => {
} }
if (me) generateMutedUserQueryForUsers(query, me); if (me) generateMutedUserQueryForUsers(query, me);
if (me) generateBlockedUserQuery(query, me); if (me) generateBlockQueryForUsers(query, me);
query.take(ps.limit!); query.take(ps.limit!);
query.skip(ps.offset); query.skip(ps.offset);

2
src/services/logger.ts
View File

@ -8,7 +8,7 @@ import { Log } from '@/models/entities/log';
import { genId } from '@/misc/gen-id'; import { genId } from '@/misc/gen-id';
import config from '@/config/index'; import config from '@/config/index';
import SyslogPro from 'syslog-pro'; import * as SyslogPro from 'syslog-pro';
type Domain = { type Domain = {
name: string; name: string;