diff options
Diffstat (limited to 'src/server/api')
| -rw-r--r-- | src/server/api/call.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/blocking/create.ts | 4 | ||||
| -rw-r--r-- | src/server/api/endpoints/blocking/delete.ts | 4 | ||||
| -rw-r--r-- | src/server/api/endpoints/sw/register.ts | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/server/api/call.ts b/src/server/api/call.ts index c79f8eef5d..8be1b71cfa 100644 --- a/src/server/api/call.ts +++ b/src/server/api/call.ts @@ -59,7 +59,7 @@ export default async (endpoint: string, user: User | null | undefined, app: App }); } - if (ep.meta.requireCredential && ep.meta.limit) { + if (ep.meta.requireCredential && ep.meta.limit && !user!.isAdmin && !user!.isModerator) { // Rate limit await limiter(ep, user!).catch(e => { throw new ApiError({ diff --git a/src/server/api/endpoints/blocking/create.ts b/src/server/api/endpoints/blocking/create.ts index 0d6626b2d5..045be6aef3 100644 --- a/src/server/api/endpoints/blocking/create.ts +++ b/src/server/api/endpoints/blocking/create.ts @@ -5,7 +5,7 @@ import create from '../../../../services/blocking/create'; import define from '../../define'; import { ApiError } from '../../error'; import { getUser } from '../../common/getters'; -import { Blockings, NoteWatchings } from '../../../../models'; +import { Blockings, NoteWatchings, Users } from '../../../../models'; export const meta = { stability: 'stable', @@ -89,5 +89,5 @@ export default define(meta, async (ps, user) => { noteUserId: blockee.id }); - return await Blockings.pack(blockee.id, user); + return await Users.pack(blockee.id, user); }); diff --git a/src/server/api/endpoints/blocking/delete.ts b/src/server/api/endpoints/blocking/delete.ts index e304dca811..ecb5d1109e 100644 --- a/src/server/api/endpoints/blocking/delete.ts +++ b/src/server/api/endpoints/blocking/delete.ts @@ -5,7 +5,7 @@ import deleteBlocking from '../../../../services/blocking/delete'; import define from '../../define'; import { ApiError } from '../../error'; import { getUser } from '../../common/getters'; -import { Blockings } from '../../../../models'; +import { Blockings, Users } from '../../../../models'; export const meta = { stability: 'stable', @@ -84,5 +84,5 @@ export default define(meta, async (ps, user) => { // Delete blocking await deleteBlocking(blocker, blockee); - return await Blockings.pack(blockee.id, user); + return await Users.pack(blockee.id, user); }); diff --git a/src/server/api/endpoints/sw/register.ts b/src/server/api/endpoints/sw/register.ts index 79bc18bf21..559937ca2f 100644 --- a/src/server/api/endpoints/sw/register.ts +++ b/src/server/api/endpoints/sw/register.ts @@ -27,7 +27,6 @@ export const meta = { export default define(meta, async (ps, user) => { // if already subscribed const exist = await SwSubscriptions.findOne({ - createdAt: new Date(), userId: user.id, endpoint: ps.endpoint, auth: ps.auth, @@ -45,6 +44,7 @@ export default define(meta, async (ps, user) => { await SwSubscriptions.save({ id: genId(), + createdAt: new Date(), userId: user.id, endpoint: ps.endpoint, auth: ps.auth, |