Merge branch 'develop'

7 files changed, 13 insertions, 12 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,
diff --git a/src/server/file/assets/avatar.jpg b/src/server/file/assets/avatar.jpg
deleted file mode 100644
index be0c3ca829..0000000000
--- a/src/server/file/assets/avatar.jpg
+++ /dev/null
diff --git a/src/server/file/index.ts b/src/server/file/index.ts
index e3487a2636..1cdf5207e4 100644
--- a/src/server/file/index.ts
+++ b/src/server/file/index.ts
@@ -21,12 +21,6 @@ app.use(async (ctx, next) => {
 // Init router
 const router = new Router();
 
-router.get('/default-avatar.jpg', ctx => {
-	const file = fs.createReadStream(`${__dirname}/assets/avatar.jpg`);
-	ctx.set('Content-Type', 'image/jpeg');
-	ctx.body = file;
-});
-
 router.get('/app-default.jpg', ctx => {
 	const file = fs.createReadStream(`${__dirname}/assets/dummy.png`);
 	ctx.set('Content-Type', 'image/jpeg');
diff --git a/src/server/index.ts b/src/server/index.ts
index 601e288f3b..7d8938d584 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -25,6 +25,7 @@ import Logger from '../services/logger';
 import { program } from '../argv';
 import { UserProfiles } from '../models';
 import { networkChart } from '../services/chart';
+import { genAvatar } from '../misc/gen-avatar';
 
 export const serverLogger = new Logger('server', 'gray', false);
 
@@ -72,6 +73,12 @@ router.use(activityPub.routes());
 router.use(nodeinfo.routes());
 router.use(wellKnown.routes());
 
+router.get('/avatar/:x', ctx => {
+	const avatar = genAvatar(ctx.params.x);
+	ctx.set('Content-Type', 'image/png');
+	ctx.body = avatar;
+});
+
 router.get('/verify-email/:code', async ctx => {
 	const profile = await UserProfiles.findOne({
 		emailVerifyCode: ctx.params.code