summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/admin
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/api/endpoints/admin')
-rw-r--r--src/server/api/endpoints/admin/emoji/add.ts7
-rw-r--r--src/server/api/endpoints/admin/emoji/remove.ts7
-rw-r--r--src/server/api/endpoints/admin/queue/clear.ts5
-rw-r--r--src/server/api/endpoints/admin/show-moderation-logs.ts35
-rw-r--r--src/server/api/endpoints/admin/show-users.ts18
-rw-r--r--src/server/api/endpoints/admin/silence-user.ts7
-rw-r--r--src/server/api/endpoints/admin/suspend-user.ts13
-rw-r--r--src/server/api/endpoints/admin/unsilence-user.ts7
-rw-r--r--src/server/api/endpoints/admin/unsuspend-user.ts10
-rw-r--r--src/server/api/endpoints/admin/update-meta.ts5
-rw-r--r--src/server/api/endpoints/admin/vacuum.ts5
11 files changed, 108 insertions, 11 deletions
diff --git a/src/server/api/endpoints/admin/emoji/add.ts b/src/server/api/endpoints/admin/emoji/add.ts
index 5ba00afde8..8c21b1c73e 100644
--- a/src/server/api/endpoints/admin/emoji/add.ts
+++ b/src/server/api/endpoints/admin/emoji/add.ts
@@ -4,6 +4,7 @@ import { detectUrlMine } from '../../../../../misc/detect-url-mine';
import { Emojis } from '../../../../../models';
import { genId } from '../../../../../misc/gen-id';
import { getConnection } from 'typeorm';
+import { insertModerationLog } from '../../../../../services/insert-moderation-log';
export const meta = {
desc: {
@@ -31,7 +32,7 @@ export const meta = {
}
};
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
const type = await detectUrlMine(ps.url);
const emoji = await Emojis.save({
@@ -46,6 +47,10 @@ export default define(meta, async (ps) => {
await getConnection().queryResultCache!.remove(['meta_emojis']);
+ insertModerationLog(me, 'addEmoji', {
+ emojiId: emoji.id
+ });
+
return {
id: emoji.id
};
diff --git a/src/server/api/endpoints/admin/emoji/remove.ts b/src/server/api/endpoints/admin/emoji/remove.ts
index 3ebf933bc6..92c5f5f8c6 100644
--- a/src/server/api/endpoints/admin/emoji/remove.ts
+++ b/src/server/api/endpoints/admin/emoji/remove.ts
@@ -3,6 +3,7 @@ import define from '../../../define';
import { ID } from '../../../../../misc/cafy-id';
import { Emojis } from '../../../../../models';
import { getConnection } from 'typeorm';
+import { insertModerationLog } from '../../../../../services/insert-moderation-log';
export const meta = {
desc: {
@@ -21,7 +22,7 @@ export const meta = {
}
};
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
const emoji = await Emojis.findOne(ps.id);
if (emoji == null) throw new Error('emoji not found');
@@ -29,4 +30,8 @@ export default define(meta, async (ps) => {
await Emojis.delete(emoji.id);
await getConnection().queryResultCache!.remove(['meta_emojis']);
+
+ insertModerationLog(me, 'removeEmoji', {
+ emoji: emoji
+ });
});
diff --git a/src/server/api/endpoints/admin/queue/clear.ts b/src/server/api/endpoints/admin/queue/clear.ts
index f0fd00f1ad..03c1ae8463 100644
--- a/src/server/api/endpoints/admin/queue/clear.ts
+++ b/src/server/api/endpoints/admin/queue/clear.ts
@@ -1,5 +1,6 @@
import define from '../../../define';
import { destroy } from '../../../../../queue';
+import { insertModerationLog } from '../../../../../services/insert-moderation-log';
export const meta = {
tags: ['admin'],
@@ -10,8 +11,8 @@ export const meta = {
params: {}
};
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
destroy();
- return;
+ insertModerationLog(me, 'clearQueue');
});
diff --git a/src/server/api/endpoints/admin/show-moderation-logs.ts b/src/server/api/endpoints/admin/show-moderation-logs.ts
new file mode 100644
index 0000000000..bc67b3e55b
--- /dev/null
+++ b/src/server/api/endpoints/admin/show-moderation-logs.ts
@@ -0,0 +1,35 @@
+import $ from 'cafy';
+import { ID } from '../../../../misc/cafy-id';
+import define from '../../define';
+import { ModerationLogs } from '../../../../models';
+import { makePaginationQuery } from '../../common/make-pagination-query';
+
+export const meta = {
+ tags: ['admin'],
+
+ requireCredential: true,
+ requireModerator: true,
+
+ params: {
+ limit: {
+ validator: $.optional.num.range(1, 100),
+ default: 10
+ },
+
+ sinceId: {
+ validator: $.optional.type(ID),
+ },
+
+ untilId: {
+ validator: $.optional.type(ID),
+ },
+ }
+};
+
+export default define(meta, async (ps) => {
+ const query = makePaginationQuery(ModerationLogs.createQueryBuilder('report'), ps.sinceId, ps.untilId);
+
+ const reports = await query.take(ps.limit!).getMany();
+
+ return await ModerationLogs.packMany(reports);
+});
diff --git a/src/server/api/endpoints/admin/show-users.ts b/src/server/api/endpoints/admin/show-users.ts
index 8733d87a38..89e0cf1e2a 100644
--- a/src/server/api/endpoints/admin/show-users.ts
+++ b/src/server/api/endpoints/admin/show-users.ts
@@ -49,6 +49,16 @@ export const meta = {
'remote',
]),
default: 'local'
+ },
+
+ username: {
+ validator: $.optional.str,
+ default: null
+ },
+
+ hostname: {
+ validator: $.optional.str,
+ default: null
}
}
};
@@ -70,6 +80,14 @@ export default define(meta, async (ps, me) => {
case 'remote': query.andWhere('user.host IS NOT NULL'); break;
}
+ if (ps.username) {
+ query.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' });
+ }
+
+ if (ps.hostname) {
+ query.andWhere('user.host like :hostname', { hostname: '%' + ps.hostname.toLowerCase() + '%' });
+ }
+
switch (ps.sort) {
case '+follower': query.orderBy('user.followersCount', 'DESC'); break;
case '-follower': query.orderBy('user.followersCount', 'ASC'); break;
diff --git a/src/server/api/endpoints/admin/silence-user.ts b/src/server/api/endpoints/admin/silence-user.ts
index 83aa88012a..8cc84aa1cc 100644
--- a/src/server/api/endpoints/admin/silence-user.ts
+++ b/src/server/api/endpoints/admin/silence-user.ts
@@ -2,6 +2,7 @@ import $ from 'cafy';
import { ID } from '../../../../misc/cafy-id';
import define from '../../define';
import { Users } from '../../../../models';
+import { insertModerationLog } from '../../../../services/insert-moderation-log';
export const meta = {
desc: {
@@ -25,7 +26,7 @@ export const meta = {
}
};
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
const user = await Users.findOne(ps.userId as string);
if (user == null) {
@@ -39,4 +40,8 @@ export default define(meta, async (ps) => {
await Users.update(user.id, {
isSilenced: true
});
+
+ insertModerationLog(me, 'silence', {
+ targetId: user.id,
+ });
});
diff --git a/src/server/api/endpoints/admin/suspend-user.ts b/src/server/api/endpoints/admin/suspend-user.ts
index fa4d378708..6ba0d91505 100644
--- a/src/server/api/endpoints/admin/suspend-user.ts
+++ b/src/server/api/endpoints/admin/suspend-user.ts
@@ -4,6 +4,8 @@ import define from '../../define';
import deleteFollowing from '../../../../services/following/delete';
import { Users, Followings } from '../../../../models';
import { User } from '../../../../models/entities/user';
+import { insertModerationLog } from '../../../../services/insert-moderation-log';
+import { doPostSuspend } from '../../../../services/suspend-user';
export const meta = {
desc: {
@@ -27,7 +29,7 @@ export const meta = {
}
};
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
const user = await Users.findOne(ps.userId as string);
if (user == null) {
@@ -46,7 +48,14 @@ export default define(meta, async (ps) => {
isSuspended: true
});
- unFollowAll(user);
+ insertModerationLog(me, 'suspend', {
+ targetId: user.id,
+ });
+
+ (async () => {
+ await doPostSuspend(user).catch(e => {});
+ await unFollowAll(user).catch(e => {});
+ })();
});
async function unFollowAll(follower: User) {
diff --git a/src/server/api/endpoints/admin/unsilence-user.ts b/src/server/api/endpoints/admin/unsilence-user.ts
index f9b173366b..607c9b699a 100644
--- a/src/server/api/endpoints/admin/unsilence-user.ts
+++ b/src/server/api/endpoints/admin/unsilence-user.ts
@@ -2,6 +2,7 @@ import $ from 'cafy';
import { ID } from '../../../../misc/cafy-id';
import define from '../../define';
import { Users } from '../../../../models';
+import { insertModerationLog } from '../../../../services/insert-moderation-log';
export const meta = {
desc: {
@@ -25,7 +26,7 @@ export const meta = {
}
};
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
const user = await Users.findOne(ps.userId as string);
if (user == null) {
@@ -35,4 +36,8 @@ export default define(meta, async (ps) => {
await Users.update(user.id, {
isSilenced: false
});
+
+ insertModerationLog(me, 'unsilence', {
+ targetId: user.id,
+ });
});
diff --git a/src/server/api/endpoints/admin/unsuspend-user.ts b/src/server/api/endpoints/admin/unsuspend-user.ts
index 08dae034d3..237585e276 100644
--- a/src/server/api/endpoints/admin/unsuspend-user.ts
+++ b/src/server/api/endpoints/admin/unsuspend-user.ts
@@ -2,6 +2,8 @@ import $ from 'cafy';
import { ID } from '../../../../misc/cafy-id';
import define from '../../define';
import { Users } from '../../../../models';
+import { insertModerationLog } from '../../../../services/insert-moderation-log';
+import { doPostUnsuspend } from '../../../../services/unsuspend-user';
export const meta = {
desc: {
@@ -25,7 +27,7 @@ export const meta = {
}
};
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
const user = await Users.findOne(ps.userId as string);
if (user == null) {
@@ -35,4 +37,10 @@ export default define(meta, async (ps) => {
await Users.update(user.id, {
isSuspended: false
});
+
+ insertModerationLog(me, 'unsuspend', {
+ targetId: user.id,
+ });
+
+ doPostUnsuspend(user);
});
diff --git a/src/server/api/endpoints/admin/update-meta.ts b/src/server/api/endpoints/admin/update-meta.ts
index 8e98d203ff..834faa42b9 100644
--- a/src/server/api/endpoints/admin/update-meta.ts
+++ b/src/server/api/endpoints/admin/update-meta.ts
@@ -2,6 +2,7 @@ import $ from 'cafy';
import define from '../../define';
import { getConnection } from 'typeorm';
import { Meta } from '../../../../models/entities/meta';
+import { insertModerationLog } from '../../../../services/insert-moderation-log';
export const meta = {
desc: {
@@ -401,7 +402,7 @@ export const meta = {
}
};
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
const set = {} as Partial<Meta>;
if (ps.announcements) {
@@ -653,4 +654,6 @@ export default define(meta, async (ps) => {
await transactionalEntityManager.save(Meta, set);
}
});
+
+ insertModerationLog(me, 'updateMeta');
});
diff --git a/src/server/api/endpoints/admin/vacuum.ts b/src/server/api/endpoints/admin/vacuum.ts
index 6990706282..4921e228e5 100644
--- a/src/server/api/endpoints/admin/vacuum.ts
+++ b/src/server/api/endpoints/admin/vacuum.ts
@@ -1,6 +1,7 @@
import $ from 'cafy';
import define from '../../define';
import { getConnection } from 'typeorm';
+import { insertModerationLog } from '../../../../services/insert-moderation-log';
export const meta = {
tags: ['admin'],
@@ -18,7 +19,7 @@ export const meta = {
}
};
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
const params: string[] = [];
if (ps.full) {
@@ -30,4 +31,6 @@ export default define(meta, async (ps) => {
}
getConnection().query('VACUUM ' + params.join(' '));
+
+ insertModerationLog(me, 'vacuum', ps);
});
generated by cgit v1.2.3-freya (git 2.53.0.84.g453e7b744a) at 2026-03-03 16:34:31 +0000