summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-04-15 20:37:21 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-04-15 20:37:21 +0900
commit18bc4a49e8f9e660672452e0833937d41873531e (patch)
tree49a0cb30280b0c1dbcbfb1d4968d37da84b1423e /src/server
parentFix error (diff)
downloadsharkey-18bc4a49e8f9e660672452e0833937d41873531e.tar.gz
sharkey-18bc4a49e8f9e660672452e0833937d41873531e.tar.bz2
sharkey-18bc4a49e8f9e660672452e0833937d41873531e.zip
ランダムにアバターを生成するように
Diffstat (limited to 'src/server')
-rw-r--r--src/server/file/assets/avatar.jpgbin1261 -> 0 bytes
-rw-r--r--src/server/file/index.ts6
-rw-r--r--src/server/index.ts7
3 files changed, 7 insertions, 6 deletions
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
Binary files differ
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