From 22c5db7121aaa0284fa156d00ed8524ac6344998 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 31 Dec 2018 20:25:44 +0000 Subject: [PATCH 01/20] Update @types/elasticsearch requirement from 5.0.29 to 5.0.30 Updates the requirements on [@types/elasticsearch](https://github.com/DefinitelyTyped/DefinitelyTyped) to permit the latest version. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 090ec5d2f..43f7bb21b 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@types/debug": "0.0.31", "@types/deep-equal": "1.0.1", "@types/double-ended-queue": "2.1.0", - "@types/elasticsearch": "5.0.29", + "@types/elasticsearch": "5.0.30", "@types/file-type": "10.6.0", "@types/gulp": "3.8.36", "@types/gulp-mocha": "0.0.32", From 43bcdf397eef6e42ae2ee9aa4ac6598f471f3d59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 31 Dec 2018 20:27:42 +0000 Subject: [PATCH 02/20] Update @fortawesome/free-brands-svg-icons requirement Updates the requirements on [@fortawesome/free-brands-svg-icons](https://github.com/FortAwesome/Font-Awesome) to permit the latest version. - [Release notes](https://github.com/FortAwesome/Font-Awesome/releases) - [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md) - [Commits](https://github.com/FortAwesome/Font-Awesome/commits/5.6.3) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 090ec5d2f..aaa7271bb 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "dependencies": { "@fortawesome/fontawesome-svg-core": "1.2.8", - "@fortawesome/free-brands-svg-icons": "5.6.0", + "@fortawesome/free-brands-svg-icons": "5.6.3", "@fortawesome/free-regular-svg-icons": "5.5.0", "@fortawesome/free-solid-svg-icons": "5.6.3", "@fortawesome/vue-fontawesome": "0.1.2", From 96515c454423d9f7aba501f7c1d08d5327645f31 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Wed, 2 Jan 2019 03:35:42 +0900 Subject: [PATCH 03/20] Resolve #3813 (#3814) --- src/client/app/desktop/views/components/post-form.vue | 6 ++++++ src/client/app/mobile/views/components/post-form.vue | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue index 98c16cd5d..a971e3d05 100644 --- a/src/client/app/desktop/views/components/post-form.vue +++ b/src/client/app/desktop/views/components/post-form.vue @@ -221,6 +221,12 @@ export default Vue.extend({ }); } + // keep cw when reply + if (this.reply && this.reply.cw != null) { + this.useCw = true; + this.cw = this.reply.cw; + } + this.$nextTick(() => { // 書きかけの投稿を復元 if (!this.instant && !this.mention) { diff --git a/src/client/app/mobile/views/components/post-form.vue b/src/client/app/mobile/views/components/post-form.vue index 00d0eebd6..f4bbc4fc0 100644 --- a/src/client/app/mobile/views/components/post-form.vue +++ b/src/client/app/mobile/views/components/post-form.vue @@ -211,6 +211,12 @@ export default Vue.extend({ }); } + // keep cw when reply + if (this.reply && this.reply.cw != null) { + this.useCw = true; + this.cw = this.reply.cw; + } + this.focus(); this.$nextTick(() => { From 41e3a9a004b53fb81f8250d6d0fc369445e69037 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Wed, 2 Jan 2019 18:07:32 +0900 Subject: [PATCH 04/20] Tune AP URL negotiating with Accept (#3824) --- src/server/activitypub.ts | 6 ++++-- src/server/web/index.ts | 28 +++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/server/activitypub.ts b/src/server/activitypub.ts index 42d90ab91..9adc3dd94 100644 --- a/src/server/activitypub.ts +++ b/src/server/activitypub.ts @@ -83,7 +83,7 @@ router.get('/notes/:note', async (ctx, next) => { } ctx.body = pack(await renderNote(note, false)); - ctx.set('Cache-Control', 'private, max-age=0, must-revalidate'); + ctx.set('Cache-Control', 'public, max-age=180'); setResponseType(ctx); }); @@ -162,7 +162,9 @@ async function userInfo(ctx: Router.IRouterContext, user: IUser) { setResponseType(ctx); } -router.get('/users/:user', async ctx => { +router.get('/users/:user', async (ctx, next) => { + if (!isActivityPubReq(ctx)) return await next(); + if (!ObjectID.isValid(ctx.params.user)) { ctx.status = 404; return; diff --git a/src/server/web/index.ts b/src/server/web/index.ts index 998fd2adf..59b8390ab 100644 --- a/src/server/web/index.ts +++ b/src/server/web/index.ts @@ -148,6 +148,27 @@ router.get('/@:user', async (ctx, next) => { } }); +router.get('/users/:user', async ctx => { + if (!ObjectID.isValid(ctx.params.user)) { + ctx.status = 404; + return; + } + + const userId = new ObjectID(ctx.params.user); + + const user = await User.findOne({ + _id: userId, + host: null + }); + + if (user === null) { + ctx.status = 404; + return; + } + + ctx.redirect(`/@${user.username}${ user.host == null ? '' : '@' + user.host}`); +}); + // Note router.get('/notes/:note', async ctx => { if (ObjectID.isValid(ctx.params.note)) { @@ -159,7 +180,12 @@ router.get('/notes/:note', async ctx => { note: _note, summary: getNoteSummary(_note) }); - ctx.set('Cache-Control', 'private, max-age=0, must-revalidate'); + + if (['public', 'home'].includes(note.visibility)) { + ctx.set('Cache-Control', 'public, max-age=180'); + } else { + ctx.set('Cache-Control', 'private, max-age=0, must-revalidate'); + } return; } From 8c21b8a9a6861f9b07b615bf90423df7368229a2 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 2 Jan 2019 18:10:23 +0900 Subject: [PATCH 05/20] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89f366ecc..29771a938 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ ChangeLog ========= +unreleased +---------- +* Pleromaとのフェデレーションを修正 + 10.73.0 ------- * テーマの強化 From 165350cca64d64eab7c6c2b3342674cabf8d97ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 3 Jan 2019 08:36:00 +0900 Subject: [PATCH 06/20] Update apexcharts requirement from 2.4.2 to 2.5.1 (#3826) Updates the requirements on [apexcharts](https://github.com/apexcharts/apexcharts.js) to permit the latest version. - [Release notes](https://github.com/apexcharts/apexcharts.js/releases) - [Changelog](https://github.com/apexcharts/apexcharts.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/apexcharts/apexcharts.js/commits/v2.5.1) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 090ec5d2f..cd29eb727 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "@types/websocket": "0.0.40", "@types/ws": "6.0.1", "animejs": "2.2.0", - "apexcharts": "2.4.2", + "apexcharts": "2.5.1", "autobind-decorator": "2.4.0", "autosize": "4.0.2", "autwh": "0.1.0", From 866d4cd59a2cffe58e29ced0fc00fb9575568dc3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 3 Jan 2019 08:37:44 +0900 Subject: [PATCH 07/20] Update vue-i18n requirement from 8.3.2 to 8.6.0 (#3821) Updates the requirements on [vue-i18n](https://github.com/kazupon/vue-i18n) to permit the latest version. - [Release notes](https://github.com/kazupon/vue-i18n/releases) - [Changelog](https://github.com/kazupon/vue-i18n/blob/dev/CHANGELOG.md) - [Commits](https://github.com/kazupon/vue-i18n/commits/v8.6.0) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cd29eb727..96e964495 100644 --- a/package.json +++ b/package.json @@ -222,7 +222,7 @@ "vue-color": "2.7.0", "vue-content-loading": "1.5.3", "vue-cropperjs": "3.0.0", - "vue-i18n": "8.3.2", + "vue-i18n": "8.6.0", "vue-js-modal": "1.3.28", "vue-loader": "15.4.2", "vue-marquee-text-component": "1.1.0", From 2a344dfbd84ff84e9d79a3c5fc172756bf153954 Mon Sep 17 00:00:00 2001 From: "Ch. (Chanhwi Choi)" Date: Thu, 3 Jan 2019 08:38:26 +0900 Subject: [PATCH 08/20] =?UTF-8?q?adds=20ko-KR=20=E3=81=AA=20to=20=E3=81=AB?= =?UTF-8?q?=E3=82=83=20(#3820)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * adds ko-KR な to にゃ - this only take considers pre-composed "Hangul Syllables", not composable area "Hangul Jamo" which are not used commonly - 56 is '냐' - '나' * replace magic number as suggested --- src/models/note.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/models/note.ts b/src/models/note.ts index f33497075..f2fb39051 100644 --- a/src/models/note.ts +++ b/src/models/note.ts @@ -372,7 +372,14 @@ export const pack = async ( //#endregion if (_note.user.isCat && _note.text) { - _note.text = _note.text.replace(/な/g, 'にゃ').replace(/ナ/g, 'ニャ').replace(/ﾅ/g, 'ﾆｬ'); + _note.text = (_note.text + // ja-JP + .replace(/な/g, 'にゃ').replace(/ナ/g, 'ニャ').replace(/ﾅ/g, 'ﾆｬ') + // ko-KR + .replace(/[나-낳]/g, (match: string) => String.fromCharCode( + match.codePointAt(0) + '냐'.charCodeAt(0) - '나'.charCodeAt(0) + )) + ); } if (!opts.skipHide) { From 309058f20959ca7a09a76a411a4a3010192f0ef3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 3 Jan 2019 08:39:17 +0900 Subject: [PATCH 09/20] Update webpack requirement from 4.26.1 to 4.28.3 (#3822) Updates the requirements on [webpack](https://github.com/webpack/webpack) to permit the latest version. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/commits/v4.28.3) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 96e964495..67b079e70 100644 --- a/package.json +++ b/package.json @@ -237,7 +237,7 @@ "vuex-persistedstate": "2.5.4", "web-push": "3.3.3", "webfinger.js": "2.7.0", - "webpack": "4.26.1", + "webpack": "4.28.3", "webpack-cli": "3.1.2", "websocket": "1.0.28", "ws": "6.1.2", From a832672b599f37f29497e62c99e980f8fe6d72b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 3 Jan 2019 11:47:32 +0900 Subject: [PATCH 10/20] Update file-type requirement from 10.6.0 to 10.7.0 (#3815) Updates the requirements on [file-type](https://github.com/sindresorhus/file-type) to permit the latest version. - [Release notes](https://github.com/sindresorhus/file-type/releases) - [Commits](https://github.com/sindresorhus/file-type/commits/v10.7.0) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 67b079e70..281619d19 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "eventemitter3": "3.1.0", "feed": "2.0.2", "file-loader": "2.0.0", - "file-type": "10.6.0", + "file-type": "10.7.0", "fuckadblock": "3.2.1", "gulp": "3.9.1", "gulp-cssnano": "2.1.3", From 562cd6ad0bdd8a929372125f2fb2e31f889f036b Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 3 Jan 2019 12:34:08 +0900 Subject: [PATCH 11/20] Improve readability --- .../app/desktop/views/components/post-form.vue | 1 + .../app/desktop/views/components/renote-form.vue | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue index a971e3d05..297176810 100644 --- a/src/client/app/desktop/views/components/post-form.vue +++ b/src/client/app/desktop/views/components/post-form.vue @@ -77,6 +77,7 @@ import extractMentions from '../../../../../misc/extract-mentions'; export default Vue.extend({ i18n: i18n('desktop/views/components/post-form.vue'), + components: { XDraggable, MkVisibilityChooser diff --git a/src/client/app/desktop/views/components/renote-form.vue b/src/client/app/desktop/views/components/renote-form.vue index e6a09c3ee..d8f38bedf 100644 --- a/src/client/app/desktop/views/components/renote-form.vue +++ b/src/client/app/desktop/views/components/renote-form.vue @@ -21,7 +21,14 @@ import i18n from '../../../i18n'; export default Vue.extend({ i18n: i18n('desktop/views/components/renote-form.vue'), - props: ['note'], + + props: { + note: { + type: Object, + required: true + } + }, + data() { return { wait: false, @@ -29,6 +36,7 @@ export default Vue.extend({ visibility: this.$store.state.settings.defaultNoteVisibility }; }, + methods: { ok(v: string) { this.wait = true; @@ -44,9 +52,11 @@ export default Vue.extend({ this.wait = false; }); }, + cancel() { this.$emit('canceled'); }, + onQuote() { this.quote = true; @@ -54,6 +64,7 @@ export default Vue.extend({ (this.$refs.form as any).focus(); }); }, + onChildFormPosted() { this.$emit('posted'); } From ebf9cd18c85a8d601941fae5af5a53b6d834346c Mon Sep 17 00:00:00 2001 From: ibrokemypie Date: Fri, 4 Jan 2019 05:02:40 +1100 Subject: [PATCH 12/20] Make instance logo customisable (#3829) --- locales/en-US.yml | 1 + src/client/app/admin/views/instance.vue | 4 ++++ src/client/app/desktop/views/pages/welcome.vue | 2 +- src/misc/fetch-meta.ts | 1 + src/models/meta.ts | 1 + src/server/api/endpoints/admin/update-meta.ts | 11 +++++++++++ src/server/api/endpoints/meta.ts | 1 + 7 files changed, 20 insertions(+), 1 deletion(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index 89f8236c7..31741af15 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -992,6 +992,7 @@ admin/views/instance.vue: instance-name: "Instance name" instance-description: "Instance description" host: "Host" + logo-url: "Logo image URL" banner-url: "Banner image URL" error-image-url: "Error image URL" languages: "Language of this instance" diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue index 5a29da034..4e7d59b8e 100644 --- a/src/client/app/admin/views/instance.vue +++ b/src/client/app/admin/views/instance.vue @@ -6,6 +6,7 @@ {{ $t('host') }} {{ $t('instance-name') }} {{ $t('instance-description') }} + {{ $t('logo-url') }} {{ $t('banner-url') }} {{ $t('error-image-url') }} {{ $t('languages') }}{{ $t('languages-desc') }} @@ -149,6 +150,7 @@ export default Vue.extend({ maintainerEmail: null, disableRegistration: false, disableLocalTimeline: false, + logoUrl: null, bannerUrl: null, errorImageUrl: null, name: null, @@ -196,6 +198,7 @@ export default Vue.extend({ this.maintainerEmail = meta.maintainer.email; this.disableRegistration = meta.disableRegistration; this.disableLocalTimeline = meta.disableLocalTimeline; + this.logoUrl = meta.logoUrl; this.bannerUrl = meta.bannerUrl; this.errorImageUrl = meta.errorImageUrl; this.name = meta.name; @@ -253,6 +256,7 @@ export default Vue.extend({ maintainerEmail: this.maintainerEmail, disableRegistration: this.disableRegistration, disableLocalTimeline: this.disableLocalTimeline, + logoUrl: this.logoUrl, bannerUrl: this.bannerUrl, errorImageUrl: this.errorImageUrl, name: this.name, diff --git a/src/client/app/desktop/views/pages/welcome.vue b/src/client/app/desktop/views/pages/welcome.vue index 8abadf2c6..0aa864546 100644 --- a/src/client/app/desktop/views/pages/welcome.vue +++ b/src/client/app/desktop/views/pages/welcome.vue @@ -35,7 +35,7 @@

- + diff --git a/src/misc/fetch-meta.ts b/src/misc/fetch-meta.ts index a49e4dbe7..138646e88 100644 --- a/src/misc/fetch-meta.ts +++ b/src/misc/fetch-meta.ts @@ -19,6 +19,7 @@ const defaultMeta: any = { enableExternalUserRecommendation: false, externalUserRecommendationEngine: 'https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}', externalUserRecommendationTimeout: 300000, + logoUrl: '/assets/ai.png', errorImageUrl: 'https://ai.misskey.xyz/aiart/yubitun.png', enableServiceWorker: false }; diff --git a/src/models/meta.ts b/src/models/meta.ts index fd07438a8..b68ec43f1 100644 --- a/src/models/meta.ts +++ b/src/models/meta.ts @@ -185,6 +185,7 @@ export type IMeta = { disableRegistration?: boolean; disableLocalTimeline?: boolean; hidedTags?: string[]; + logoUrl?: string; bannerUrl?: string; errorImageUrl?: string; diff --git a/src/server/api/endpoints/admin/update-meta.ts b/src/server/api/endpoints/admin/update-meta.ts index 6ceb2a98d..f84192792 100644 --- a/src/server/api/endpoints/admin/update-meta.ts +++ b/src/server/api/endpoints/admin/update-meta.ts @@ -39,6 +39,13 @@ export const meta = { } }, + logoUrl: { + validator: $.str.optional.nullable, + desc: { + 'ja-JP': 'インスタンスロゴ画像のURL' + } + }, + bannerUrl: { validator: $.str.optional.nullable, desc: { @@ -328,6 +335,10 @@ export default define(meta, (ps) => new Promise(async (res, rej) => { set.hidedTags = ps.hidedTags; } + if (ps.logoUrl !== undefined) { + set.logoUrl = ps.logoUrl; + } + if (ps.bannerUrl !== undefined) { set.bannerUrl = ps.bannerUrl; } diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index d406f59dc..641c7728f 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -65,6 +65,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => { enableRecaptcha: instance.enableRecaptcha, recaptchaSiteKey: instance.recaptchaSiteKey, swPublickey: instance.swPublicKey, + logoUrl: instance.logoUrl, bannerUrl: instance.bannerUrl, errorImageUrl: instance.errorImageUrl, maxNoteTextLength: instance.maxNoteTextLength, From b4b6e9548d05a0313e9ed722a27edb54c9dda8e1 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 4 Jan 2019 03:52:50 +0900 Subject: [PATCH 13/20] Rename --- src/client/app/admin/views/instance.vue | 8 ++++---- src/client/app/desktop/views/pages/welcome.vue | 2 +- src/misc/fetch-meta.ts | 2 +- src/models/meta.ts | 2 +- src/server/api/endpoints/admin/update-meta.ts | 8 ++++---- src/server/api/endpoints/meta.ts | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue index 4e7d59b8e..6fd92a779 100644 --- a/src/client/app/admin/views/instance.vue +++ b/src/client/app/admin/views/instance.vue @@ -6,7 +6,7 @@ {{ $t('host') }} {{ $t('instance-name') }} {{ $t('instance-description') }} - {{ $t('logo-url') }} + {{ $t('logo-url') }} {{ $t('banner-url') }} {{ $t('error-image-url') }} {{ $t('languages') }}{{ $t('languages-desc') }} @@ -150,7 +150,7 @@ export default Vue.extend({ maintainerEmail: null, disableRegistration: false, disableLocalTimeline: false, - logoUrl: null, + mascotImageUrl: null, bannerUrl: null, errorImageUrl: null, name: null, @@ -198,7 +198,7 @@ export default Vue.extend({ this.maintainerEmail = meta.maintainer.email; this.disableRegistration = meta.disableRegistration; this.disableLocalTimeline = meta.disableLocalTimeline; - this.logoUrl = meta.logoUrl; + this.mascotImageUrl = meta.mascotImageUrl; this.bannerUrl = meta.bannerUrl; this.errorImageUrl = meta.errorImageUrl; this.name = meta.name; @@ -256,7 +256,7 @@ export default Vue.extend({ maintainerEmail: this.maintainerEmail, disableRegistration: this.disableRegistration, disableLocalTimeline: this.disableLocalTimeline, - logoUrl: this.logoUrl, + mascotImageUrl: this.mascotImageUrl, bannerUrl: this.bannerUrl, errorImageUrl: this.errorImageUrl, name: this.name, diff --git a/src/client/app/desktop/views/pages/welcome.vue b/src/client/app/desktop/views/pages/welcome.vue index 0aa864546..88a11eafa 100644 --- a/src/client/app/desktop/views/pages/welcome.vue +++ b/src/client/app/desktop/views/pages/welcome.vue @@ -35,7 +35,7 @@

- + diff --git a/src/misc/fetch-meta.ts b/src/misc/fetch-meta.ts index 138646e88..e6488da39 100644 --- a/src/misc/fetch-meta.ts +++ b/src/misc/fetch-meta.ts @@ -19,7 +19,7 @@ const defaultMeta: any = { enableExternalUserRecommendation: false, externalUserRecommendationEngine: 'https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}', externalUserRecommendationTimeout: 300000, - logoUrl: '/assets/ai.png', + mascotImageUrl: '/assets/ai.png', errorImageUrl: 'https://ai.misskey.xyz/aiart/yubitun.png', enableServiceWorker: false }; diff --git a/src/models/meta.ts b/src/models/meta.ts index b68ec43f1..daa7964d6 100644 --- a/src/models/meta.ts +++ b/src/models/meta.ts @@ -185,7 +185,7 @@ export type IMeta = { disableRegistration?: boolean; disableLocalTimeline?: boolean; hidedTags?: string[]; - logoUrl?: string; + mascotImageUrl?: string; bannerUrl?: string; errorImageUrl?: string; diff --git a/src/server/api/endpoints/admin/update-meta.ts b/src/server/api/endpoints/admin/update-meta.ts index f84192792..cf117ebd7 100644 --- a/src/server/api/endpoints/admin/update-meta.ts +++ b/src/server/api/endpoints/admin/update-meta.ts @@ -39,10 +39,10 @@ export const meta = { } }, - logoUrl: { + mascotImageUrl: { validator: $.str.optional.nullable, desc: { - 'ja-JP': 'インスタンスロゴ画像のURL' + 'ja-JP': 'インスタンスキャラクター画像のURL' } }, @@ -335,8 +335,8 @@ export default define(meta, (ps) => new Promise(async (res, rej) => { set.hidedTags = ps.hidedTags; } - if (ps.logoUrl !== undefined) { - set.logoUrl = ps.logoUrl; + if (ps.mascotImageUrl !== undefined) { + set.mascotImageUrl = ps.mascotImageUrl; } if (ps.bannerUrl !== undefined) { diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index 641c7728f..fa933513b 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -65,7 +65,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => { enableRecaptcha: instance.enableRecaptcha, recaptchaSiteKey: instance.recaptchaSiteKey, swPublickey: instance.swPublicKey, - logoUrl: instance.logoUrl, + mascotImageUrl: instance.mascotImageUrl, bannerUrl: instance.bannerUrl, errorImageUrl: instance.errorImageUrl, maxNoteTextLength: instance.maxNoteTextLength, From 4d7d119524db03771e153f0755cc02cc727a6f6d Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 4 Jan 2019 04:54:28 +0900 Subject: [PATCH 14/20] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29771a938..5ca658347 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ ChangeLog unreleased ---------- * Pleromaとのフェデレーションを修正 +* インスタンスのキャラクター画像を設定できるように +* Catモードの朝鮮語対応 +* CWが付いた投稿に返信する際、そのCWを引き継ぐように 10.73.0 ------- From b76cd18dead5d25d44ab32957cac7bd6a7685bfa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 3 Jan 2019 20:20:43 +0000 Subject: [PATCH 15/20] Update @types/koa requirement from 2.0.47 to 2.0.48 Updates the requirements on [@types/koa](https://github.com/DefinitelyTyped/DefinitelyTyped) to permit the latest version. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 281619d19..46d8af6d9 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@types/is-url": "1.2.28", "@types/js-yaml": "3.11.4", "@types/katex": "0.5.0", - "@types/koa": "2.0.47", + "@types/koa": "2.0.48", "@types/koa-bodyparser": "5.0.2", "@types/koa-compress": "2.0.8", "@types/koa-favicon": "2.0.19", From 52b23af97e7992ae257ee9ef4c974bdc9cd49402 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 3 Jan 2019 20:22:40 +0000 Subject: [PATCH 16/20] Update @types/redis requirement from 2.8.8 to 2.8.10 Updates the requirements on [@types/redis](https://github.com/DefinitelyTyped/DefinitelyTyped) to permit the latest version. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 281619d19..8ea845b90 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "@types/pug": "2.0.4", "@types/qrcode": "1.3.0", "@types/ratelimiter": "2.1.28", - "@types/redis": "2.8.8", + "@types/redis": "2.8.10", "@types/request": "2.48.1", "@types/request-promise-native": "1.0.15", "@types/rimraf": "2.0.2", From 84ea1fbd4d9087c5c0d0be7e257b33a0df2ee040 Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Sat, 5 Jan 2019 10:29:46 +0900 Subject: [PATCH 17/20] Fix typo: not -> note https://github.com/syuilo/misskey/commit/1344ffa67dbe74505bd922ac7185a4d41dfdddd7#commitcomment-31817792 --- src/server/api/endpoints/notes/reactions/create.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/api/endpoints/notes/reactions/create.ts b/src/server/api/endpoints/notes/reactions/create.ts index c9f70d965..6c9089825 100644 --- a/src/server/api/endpoints/notes/reactions/create.ts +++ b/src/server/api/endpoints/notes/reactions/create.ts @@ -45,7 +45,7 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => { } if (note.deletedAt != null) { - return rej('this not is already deleted'); + return rej('this note is already deleted'); } try { From d0aff4409d80816ebf0a82be6f505ec7dccb9cc5 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sat, 5 Jan 2019 19:59:10 +0900 Subject: [PATCH 18/20] Locked mark (#3836) --- src/client/app/common/views/components/acct.vue | 5 +++++ src/client/app/desktop/views/components/user-card.vue | 6 +++++- .../app/desktop/views/pages/deck/deck.user-column.vue | 5 ++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/client/app/common/views/components/acct.vue b/src/client/app/common/views/components/acct.vue index 69259ab60..2730e4139 100644 --- a/src/client/app/common/views/components/acct.vue +++ b/src/client/app/common/views/components/acct.vue @@ -2,6 +2,7 @@ @{{ user.username }} @{{ user.host || host }} + @@ -23,4 +24,8 @@ export default Vue.extend({ .mk-acct > .host.fade opacity 0.5 + + > .locked + opacity 0.8 + margin-left 0.5em diff --git a/src/client/app/desktop/views/components/user-card.vue b/src/client/app/desktop/views/components/user-card.vue index c59467fd0..6a42b5da0 100644 --- a/src/client/app/desktop/views/components/user-card.vue +++ b/src/client/app/desktop/views/components/user-card.vue @@ -7,7 +7,8 @@ - @{{ user | acct }} + @{{ user | acct }} +
@@ -75,6 +76,9 @@ export default Vue.extend({ display block opacity 0.7 + > .locked + opacity 0.8 + > .description margin 8px 0 16px 0 diff --git a/src/client/app/desktop/views/pages/deck/deck.user-column.vue b/src/client/app/desktop/views/pages/deck/deck.user-column.vue index 0ed7916a4..65feea969 100644 --- a/src/client/app/desktop/views/pages/deck/deck.user-column.vue +++ b/src/client/app/desktop/views/pages/deck/deck.user-column.vue @@ -19,7 +19,7 @@ - @{{ user | acct }} + @{{ user | acct }}
@@ -411,6 +411,9 @@ export default Vue.extend({ opacity 0.7 text-shadow 0 0 8px #000 + > .locked + opacity 0.8 + > .info padding 16px font-size 12px From f9065943c56f4f56ad75204d756bb22e6e6b0cac Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sun, 6 Jan 2019 04:00:30 +0900 Subject: [PATCH 19/20] Fix #3827 (#3837) --- src/client/app/desktop/views/components/post-form.vue | 6 +++--- src/client/app/mobile/views/components/post-form.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue index 297176810..27e487946 100644 --- a/src/client/app/desktop/views/components/post-form.vue +++ b/src/client/app/desktop/views/components/post-form.vue @@ -198,11 +198,11 @@ export default Vue.extend({ const mention = x.host ? `@${x.username}@${toASCII(x.host)}` : `@${x.username}`; // 自分は除外 - if (this.$store.state.i.username == x.username && x.host == null) return; - if (this.$store.state.i.username == x.username && x.host == host) return; + if (this.$store.state.i.username == x.username && x.host == null) continue; + if (this.$store.state.i.username == x.username && x.host == host) continue; // 重複は除外 - if (this.text.indexOf(`${mention} `) != -1) return; + if (this.text.indexOf(`${mention} `) != -1) continue; this.text += `${mention} `; } diff --git a/src/client/app/mobile/views/components/post-form.vue b/src/client/app/mobile/views/components/post-form.vue index f4bbc4fc0..47af21c2a 100644 --- a/src/client/app/mobile/views/components/post-form.vue +++ b/src/client/app/mobile/views/components/post-form.vue @@ -187,11 +187,11 @@ export default Vue.extend({ const mention = x.host ? `@${x.username}@${toASCII(x.host)}` : `@${x.username}`; // 自分は除外 - if (this.$store.state.i.username == x.username && x.host == null) return; - if (this.$store.state.i.username == x.username && x.host == host) return; + if (this.$store.state.i.username == x.username && x.host == null) continue; + if (this.$store.state.i.username == x.username && x.host == host) continue; // 重複は除外 - if (this.text.indexOf(`${mention} `) != -1) return; + if (this.text.indexOf(`${mention} `) != -1) continue; this.text += `${mention} `; } From a479e65f3e2ec7b6028c886d1d998a32927c8f48 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sun, 6 Jan 2019 12:56:13 +0900 Subject: [PATCH 20/20] Compact URL preview (#3835) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Compact url-preview * fix header * increase limit * better limit * Revert "better limit" This reverts commit ef396f773394068b0b7e37fccff31c70661b3978. ハードリミットかけるならサーバー上でかけたほうが良さそう * Revert "increase limit" This reverts commit 72c10a456ba37151a4d88d11544b0ff9daabd284. --- .../common/views/components/url-preview.vue | 54 +++++++++++++++++-- .../app/desktop/views/components/note.vue | 7 ++- .../app/desktop/views/components/notes.vue | 2 +- .../desktop/views/pages/deck/deck.notes.vue | 1 + .../app/mobile/views/components/note.vue | 7 ++- .../app/mobile/views/components/notes.vue | 2 +- 6 files changed, 65 insertions(+), 8 deletions(-) diff --git a/src/client/app/common/views/components/url-preview.vue b/src/client/app/common/views/components/url-preview.vue index 038541ba0..958abe00f 100644 --- a/src/client/app/common/views/components/url-preview.vue +++ b/src/client/app/common/views/components/url-preview.vue @@ -8,16 +8,16 @@
- +
-

{{ title }}

+

{{ title }}

-

{{ description.length > 85 ? description.slice(0, 85) + '…' : description }}

+

{{ description.length > 85 ? description.slice(0, 85) + '…' : description }}

-

{{ sitename }}

+

{{ sitename }}

 @@ -120,6 +120,12 @@ export default Vue.extend({ default: false }, + compact: { + type: Boolean, + required: false, + default: false + }, + mini: { type: Boolean, required: false, @@ -302,6 +308,23 @@ export default Vue.extend({ width 12px height 12px + &.compact + > .thumbnail + position: absolute + width 56px + height 100% + + > article + left 56px + width calc(100% - 56px) + padding 4px + + > header + margin-bottom 2px + + > footer + margin-top 2px + &.mini font-size 10px @@ -325,4 +348,27 @@ export default Vue.extend({ width 12px height 12px + &.compact + > .thumbnail + position: absolute + width 56px + height 100% + + > article + left 56px + width calc(100% - 56px) + padding 4px + + > header + margin-bottom 2px + + > footer + margin-top 2px + + &.compact + > article + > header h1, p, footer + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; diff --git a/src/client/app/desktop/views/components/note.vue b/src/client/app/desktop/views/components/note.vue index a52eaac7e..e5f233a55 100644 --- a/src/client/app/desktop/views/components/note.vue +++ b/src/client/app/desktop/views/components/note.vue @@ -36,7 +36,7 @@ 位置情報
- +