From 84f5308adacdd780f1ed5879bd710e5e72b762fb Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 15 Apr 2019 16:37:54 +0900 Subject: [PATCH 1/7] Fix bug --- src/server/api/endpoints/sw/register.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/api/endpoints/sw/register.ts b/src/server/api/endpoints/sw/register.ts index 79bc18bf2..559937ca2 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, From e301d0c4f10097cfd67271050cea214aec277736 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 15 Apr 2019 18:08:57 +0900 Subject: [PATCH 2/7] 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(-) diff --git a/src/server/api/endpoints/blocking/create.ts b/src/server/api/endpoints/blocking/create.ts index 0d6626b2d..045be6aef 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 e304dca81..ecb5d1109 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); }); From 83ee6f8de31d498aa9f292e5dd50246b0da3a368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Mon, 15 Apr 2019 19:05:35 +0900 Subject: [PATCH 3/7] Follow lint --- src/services/drive/add-file.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index 54d7f2d13..c79dfee10 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -209,7 +209,7 @@ async function deleteOldFile(user: IRemoteUser) { } if (user.bannerId) { - q.andWhere('file.id != :bannerId', { bannerId: user.bannerId }) + q.andWhere('file.id != :bannerId', { bannerId: user.bannerId }); } q.orderBy('file.id', 'DESC'); From 41478a7399d7779bb9ea67220c9d37a1e43dfdd1 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 15 Apr 2019 20:37:21 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=E3=83=A9=E3=83=B3=E3=83=80=E3=83=A0?= =?UTF-8?q?=E3=81=AB=E3=82=A2=E3=83=90=E3=82=BF=E3=83=BC=E3=82=92=E7=94=9F?= =?UTF-8?q?=E6=88=90=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++ src/misc/gen-avatar.ts | 89 +++++++++++++++++++++++++++++++ src/models/repositories/user.ts | 3 +- src/server/file/assets/avatar.jpg | 3 -- src/server/file/index.ts | 6 --- src/server/index.ts | 7 +++ 6 files changed, 101 insertions(+), 10 deletions(-) create mode 100644 src/misc/gen-avatar.ts delete mode 100644 src/server/file/assets/avatar.jpg diff --git a/package.json b/package.json index 5526fdab7..315c9ffcc 100644 --- a/package.json +++ b/package.json @@ -75,6 +75,7 @@ "@types/portscanner": "2.1.0", "@types/pug": "2.0.4", "@types/qrcode": "1.3.2", + "@types/random-seed": "0.3.3", "@types/ratelimiter": "2.1.28", "@types/redis": "2.8.12", "@types/rename": "1.0.1", @@ -103,6 +104,7 @@ "bootstrap-vue": "2.0.0-rc.13", "bull": "3.7.0", "cafy": "15.1.1", + "canvas": "2.4.1", "chai": "4.2.0", "chalk": "2.4.2", "cli-highlight": "2.1.0", @@ -188,6 +190,7 @@ "pug": "2.0.3", "punycode": "2.1.1", "qrcode": "1.3.3", + "random-seed": "0.3.0", "randomcolor": "0.5.4", "ratelimiter": "3.3.0", "recaptcha-promise": "0.1.3", diff --git a/src/misc/gen-avatar.ts b/src/misc/gen-avatar.ts new file mode 100644 index 000000000..7d22ee98e --- /dev/null +++ b/src/misc/gen-avatar.ts @@ -0,0 +1,89 @@ +/** + * Random avatar generator + */ + +import { createCanvas } from 'canvas'; +import * as gen from 'random-seed'; + +const size = 512; // px +const n = 5; // resolution +const margin = (size / n) / 1.5; +const colors = [ + '#e57373', + '#F06292', + '#BA68C8', + '#9575CD', + '#7986CB', + '#64B5F6', + '#4FC3F7', + '#4DD0E1', + '#4DB6AC', + '#81C784', + '#8BC34A', + '#AFB42B', + '#F57F17', + '#FF5722', + '#795548', + '#455A64', +]; +const bg = '#e9e9e9'; + +const actualSize = size - (margin * 2); +const cellSize = actualSize / n; +const sideN = Math.floor(n / 2); + +/** + * Generate buffer of random avatar by seed + */ +export function genAvatar(seed: string) { + const rand = gen.create(seed); + const canvas = createCanvas(size, size); + const ctx = canvas.getContext('2d'); + + ctx.fillStyle = bg; + ctx.beginPath(); + ctx.fillRect(0, 0, size, size); + + ctx.fillStyle = colors[rand(colors.length)]; + + // side bitmap (filled by false) + const side: boolean[][] = new Array(sideN); + for (let i = 0; i < side.length; i++) { + side[i] = new Array(n).fill(false); + } + + // 1*n (filled by false) + const center: boolean[] = new Array(n).fill(false); + + // tslint:disable-next-line:prefer-for-of + for (let x = 0; x < side.length; x++) { + for (let y = 0; y < side[x].length; y++) { + side[x][y] = rand(3) === 0; + } + } + + for (let i = 0; i < center.length; i++) { + center[i] = rand(3) === 0; + } + + // Draw + for (let x = 0; x < n; x++) { + for (let y = 0; y < n; y++) { + const isXCenter = x === ((n - 1) / 2); + if (isXCenter && !center[y]) continue; + + const isLeftSide = x < ((n - 1) / 2); + if (isLeftSide && !side[x][y]) continue; + + const isRightSide = x > ((n - 1) / 2); + if (isRightSide && !side[sideN - (x - sideN)][y]) continue; + + const actualX = margin + (cellSize * x); + const actualY = margin + (cellSize * y); + ctx.beginPath(); + ctx.fillRect(actualX, actualY, cellSize, cellSize); + } + } + + return canvas.toBuffer(); +} diff --git a/src/models/repositories/user.ts b/src/models/repositories/user.ts index 83cca2f88..9e4247545 100644 --- a/src/models/repositories/user.ts +++ b/src/models/repositories/user.ts @@ -3,6 +3,7 @@ import { User, ILocalUser, IRemoteUser } from '../entities/user'; import { Emojis, Notes, NoteUnreads, FollowRequests, Notifications, MessagingMessages, UserNotePinings, Followings, Blockings, Mutings, UserProfiles } from '..'; import rap from '@prezzemolo/rap'; import { ensure } from '../../prelude/ensure'; +import config from '../../config'; @EntityRepository(User) export class UserRepository extends Repository { @@ -88,7 +89,7 @@ export class UserRepository extends Repository { name: user.name, username: user.username, host: user.host, - avatarUrl: user.avatarUrl, + avatarUrl: user.avatarUrl ? user.avatarUrl : config.url + '/avatar/' + user.id, avatarColor: user.avatarColor, isAdmin: user.isAdmin || undefined, isBot: user.isBot || undefined, diff --git a/src/server/file/assets/avatar.jpg b/src/server/file/assets/avatar.jpg deleted file mode 100644 index cb7641deb..000000000 --- a/src/server/file/assets/avatar.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d342146d18ab53f17c55310c8f450c796d24d3dde21f39500c61d7c14fe1d61 -size 1261 diff --git a/src/server/file/index.ts b/src/server/file/index.ts index e3487a263..1cdf5207e 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 601e288f3..7d8938d58 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 From efeea7f2b4f4006ccbe3807bbccd9f873659a48e Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 15 Apr 2019 20:41:56 +0900 Subject: [PATCH 5/7] Fix bug --- src/client/app/common/views/components/mention.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/client/app/common/views/components/mention.vue b/src/client/app/common/views/components/mention.vue index e1f67282b..f212fd3ca 100644 --- a/src/client/app/common/views/components/mention.vue +++ b/src/client/app/common/views/components/mention.vue @@ -36,7 +36,9 @@ export default Vue.extend({ return this.host === localHost ? `@${this.username}` : `@${this.username}@${toUnicode(this.host)}`; }, isMe(): boolean { - return this.$store.getters.isSignedIn && this.canonical.toLowerCase() === `@${this.$store.state.i.username}@${toUnicode(localHost)}`.toLowerCase(); + return this.$store.getters.isSignedIn && ( + `@${this.username}@${toUnicode(this.host)}` === `@${this.$store.state.i.username}@${toUnicode(localHost)}`.toLowerCase() + ); } }, methods: { From aa0a5ef41b6c1f041ba4fe3309b940d4b0ce2128 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 15 Apr 2019 20:52:08 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=80=85=E3=82=84?= =?UTF-8?q?=E3=83=A2=E3=83=87=E3=83=AC=E3=83=BC=E3=82=BF=E3=83=BC=E3=81=AF?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=83=88=E3=83=AA=E3=83=9F=E3=83=83=E3=83=88?= =?UTF-8?q?=E7=84=A1=E5=8A=B9=E3=81=AB?= 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(-) diff --git a/src/server/api/call.ts b/src/server/api/call.ts index c79f8eef5..8be1b71cf 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({ From 72dfed1c08df3ce1e0e7087c3e053330d0fab946 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 15 Apr 2019 21:01:46 +0900 Subject: [PATCH 7/7] 11.1.0 --- CHANGELOG.md | 11 +++++++++++ package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba6f905e6..bf207d005 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,17 @@ If you encounter any problems with updating, please try the following: 1. `npm run clean` or `npm run cleanall` 2. Retry update (Don't forget `npm i`) +11.1.0 (2019/04/15) +------------------- +### Improvements +* アイコン未設定時にランダムな画像を表示するように +* 管理者やモデレーターはレートリミット無効に + +### Fixes +* メンションの「あなた」インジケーターが表示されない問題を修正 +* ブロックAPIでエラーが発生する問題を修正 +* プッシュ通知の購読に失敗する問題を修正 + 11.0.3 (2019/04/15) ------------------- ### Fixes diff --git a/package.json b/package.json index 315c9ffcc..8fe0129f3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "11.0.3", + "version": "11.1.0", "codename": "daybreak", "repository": { "type": "git",