Merge branch 'develop' into swn
This commit is contained in:
commit
eb68ce2525
|
@ -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);
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue