From 190a5e175bb12a86773940d44748ed0b159b8c31 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 15 Apr 2019 16:37:54 +0900 Subject: Fix bug --- src/server/api/endpoints/sw/register.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/api') 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, -- cgit v1.2.3-freya From d2d991ff34fad61f4dc266bc44839532c77c4e2c Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 15 Apr 2019 18:08:57 +0900 Subject: Fix error --- src/server/api/endpoints/blocking/create.ts | 4 ++-- src/server/api/endpoints/blocking/delete.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/api') 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); }); -- cgit v1.2.3-freya From 4d2e98af7b55a93d5107d38be05a3996d4cc4ff0 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 15 Apr 2019 20:52:08 +0900 Subject: 管理者やモデレーターはレートリミット無効に MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/api/call.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/api') 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({ -- cgit v1.2.3-freya