diff --git a/.github/ISSUE_TEMPLATE/01_bug-report.md b/.github/ISSUE_TEMPLATE/01_bug-report.md index be84609e9..019f8c739 100644 --- a/.github/ISSUE_TEMPLATE/01_bug-report.md +++ b/.github/ISSUE_TEMPLATE/01_bug-report.md @@ -7,6 +7,11 @@ assignees: '' --- + + ## 💡 Summary diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fd048e8e..b60eb5931 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1 @@ -see [releases](https://github.com/syuilo/misskey/releases) +see [releases](https://github.com/misskey-dev/misskey/releases) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d9d6702e8..848631823 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,7 @@ - 温度感高めで見てほしいものは責付いてください。 ## Issues -Feature suggestions and bug reports are filed in https://github.com/syuilo/misskey/issues . +Feature suggestions and bug reports are filed in https://github.com/misskey-dev/misskey/issues . * Please search existing issues to avoid duplication. If your issue is already filed, please add your reaction or comment to the existing one. * If you have multiple independent issues, please submit them separately. diff --git a/README.md b/README.md index 6d4044243..5cff3619f 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@
-[![CircleCI](https://img.shields.io/circleci/project/github/syuilo/misskey.svg?style=for-the-badge&logo=circleci)](https://circleci.com/gh/syuilo/misskey) -[![Dependencies](https://img.shields.io/david/syuilo/misskey.svg?style=for-the-badge&logo=npm)](https://david-dm.org/syuilo/misskey) +[![CircleCI](https://img.shields.io/circleci/project/github/misskey-dev/misskey.svg?style=for-the-badge&logo=circleci)](https://circleci.com/gh/misskey-dev/misskey) +[![Dependencies](https://img.shields.io/david/misskey-dev/misskey.svg?style=for-the-badge&logo=npm)](https://david-dm.org/misskey-dev/misskey) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge&logo=github)](http://makeapullrequest.com) [![Awesome Humane Tech](https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true)](https://github.com/humanetech-community/awesome-humane-tech) @@ -22,11 +22,16 @@ Why don't you take a short break from the hustle and bustle of the city, and div --- +Do you have a question? Or are you experiencing trouble? +Visit [our forum](https://forum.misskey.io/)! + +--- + ![](https://ja.mstdn.wiki/images/e/ed/Deck.jpg) :sparkles: Features ---------------------------------------------------------------- - +

Posting

diff --git a/docs/docker.en.md b/docs/docker.en.md index 965c89a51..93eee8e4b 100644 --- a/docs/docker.en.md +++ b/docs/docker.en.md @@ -12,13 +12,13 @@ This guide describes how to install and setup Misskey with Docker. ---------------------------------------------------------------- 1. Clone Misskey repository's master branch. - `git clone -b master git://github.com/syuilo/misskey.git` + `git clone -b master git://github.com/misskey-dev/misskey.git` 2. Move to misskey directory. `cd misskey` -3. Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) tag. +3. Checkout to the [latest release](https://github.com/misskey-dev/misskey/releases/latest) tag. `git checkout master` diff --git a/docs/docker.fr.md b/docs/docker.fr.md index 52d42ff2e..7abd46335 100644 --- a/docs/docker.fr.md +++ b/docs/docker.fr.md @@ -13,13 +13,13 @@ Ce guide explique comment installer et configurer Misskey avec Docker. ---------------------------------------------------------------- 1. Clone le dépôt de Misskey sur la branche master. - `git clone -b master git://github.com/syuilo/misskey.git` + `git clone -b master git://github.com/misskey-dev/misskey.git` 2. Naviguez dans le dossier du dépôt. `cd misskey` -3. Checkout sur le tag de la [dernière version](https://github.com/syuilo/misskey/releases/latest). +3. Checkout sur le tag de la [dernière version](https://github.com/misskey-dev/misskey/releases/latest). `git checkout master` diff --git a/docs/docker.ja.md b/docs/docker.ja.md index befcc9116..15b1a944a 100644 --- a/docs/docker.ja.md +++ b/docs/docker.ja.md @@ -12,13 +12,13 @@ Dockerを使ったMisskey構築方法 ---------------------------------------------------------------- 1. masterブランチからMisskeyレポジトリをクローン - `git clone -b master git://github.com/syuilo/misskey.git` + `git clone -b master git://github.com/misskey-dev/misskey.git` 2. misskeyディレクトリに移動 `cd misskey` -3. [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認 +3. [最新のリリース](https://github.com/misskey-dev/misskey/releases/latest)を確認 `git checkout master` diff --git a/docs/docker.zh.md b/docs/docker.zh.md index a9d050e95..a842fcb0c 100644 --- a/docs/docker.zh.md +++ b/docs/docker.zh.md @@ -12,13 +12,13 @@ Docker 部署指南 ---------------------------------------------------------------- 1. 克隆 Misskey 项目的 master 分支。 - `git clone -b master git://github.com/syuilo/misskey.git` + `git clone -b master git://github.com/misskey-dev/misskey.git` 2. 进入 misskey 文件夹。 `cd misskey` -3. 检查 [最新发布版](https://github.com/syuilo/misskey/releases/latest) 标签。 +3. 检查 [最新发布版](https://github.com/misskey-dev/misskey/releases/latest) 标签。 `git checkout master` diff --git a/docs/setup.en.md b/docs/setup.en.md index a68e36994..bd36f0f00 100644 --- a/docs/setup.en.md +++ b/docs/setup.en.md @@ -40,13 +40,13 @@ Please install and setup these softwares: 2. Clone the misskey repo from master branch. - `git clone -b master git://github.com/syuilo/misskey.git` + `git clone -b master git://github.com/misskey-dev/misskey.git` 3. Navigate to misskey directory `cd misskey` -4. Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) +4. Checkout to the [latest release](https://github.com/misskey-dev/misskey/releases/latest) `git checkout master` diff --git a/docs/setup.fr.md b/docs/setup.fr.md index b16447c4f..7f4795eec 100644 --- a/docs/setup.fr.md +++ b/docs/setup.fr.md @@ -41,13 +41,13 @@ Installez les paquets suivants : 2. Clonez la branche master du dépôt misskey. - `git clone -b master git://github.com/syuilo/misskey.git` + `git clone -b master git://github.com/misskey-dev/misskey.git` 3. Accédez au dossier misskey. `cd misskey` -4. Checkout sur le tag de la [version la plus récente](https://github.com/syuilo/misskey/releases/latest) +4. Checkout sur le tag de la [version la plus récente](https://github.com/misskey-dev/misskey/releases/latest) `git checkout master` diff --git a/docs/setup.ja.md b/docs/setup.ja.md index 7f4ab6999..e8bae56f4 100644 --- a/docs/setup.ja.md +++ b/docs/setup.ja.md @@ -42,13 +42,13 @@ adduser --disabled-password --disabled-login misskey 2. masterブランチからMisskeyレポジトリをクローン - `git clone -b master git://github.com/syuilo/misskey.git` + `git clone -b master git://github.com/misskey-dev/misskey.git` 3. misskeyディレクトリに移動 `cd misskey` -4. [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認 +4. [最新のリリース](https://github.com/misskey-dev/misskey/releases/latest)を確認 `git checkout master` diff --git a/docs/setup.zh.md b/docs/setup.zh.md index 196e8a541..50664706b 100644 --- a/docs/setup.zh.md +++ b/docs/setup.zh.md @@ -40,13 +40,13 @@ adduser --disabled-password --disabled-login misskey 2. 克隆 Misskey 项目的 master 分支。 - `git clone -b master git://github.com/syuilo/misskey.git` + `git clone -b master git://github.com/misskey-dev/misskey.git` 3. 进入 misskey 文件夹。 `cd misskey` -4. 检查 [最新发布版](https://github.com/syuilo/misskey/releases/latest) 标签。 +4. 检查 [最新发布版](https://github.com/misskey-dev/misskey/releases/latest) 标签。 `git checkout master` diff --git a/locales/README.md b/locales/README.md index 775a39a3c..a31df4f4c 100644 --- a/locales/README.md +++ b/locales/README.md @@ -1,6 +1,6 @@ # **DO NOT edit locale files** except `ja-JP.yml`. -When you add text to the ja-JP file (of syuilo/misskey), it will automatically be applied to other language files. +When you add text to the ja-JP file (of misskey-dev/misskey), it will automatically be applied to other language files. Translations added in ja-JP file should contain the original Japanese strings. Please see [Contribution guide](../CONTRIBUTING.md) for more information. diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 5729da8da..33d7e760a 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -687,6 +687,7 @@ textColor: "文字" saveAs: "名前を付けて保存" advanced: "高度" value: "値" +createdAt: "作成日時" updatedAt: "更新日時" saveConfirm: "保存しますか？" deleteConfirm: "削除しますか？" @@ -710,6 +711,12 @@ typingUsers: "{users}が入力中" jumpToSpecifiedDate: "特定の日付にジャンプ" showingPastTimeline: "過去のタイムラインを表示しています" clear: "クリア" +markAllAsRead: "全て既読にする" +goBack: "戻る" +unlikeConfirm: "いいね解除しますか？" +fullView: "フルビュー" +quitFullView: "フルビュー解除" +addDescription: "説明を追加" _email: _follow: @@ -878,6 +885,7 @@ _theme: install: "テーマのインストール" manage: "テーマの管理" code: "テーマコード" + description: "説明" installed: "{name}をインストールしました" installedThemes: "インストールされたテーマ" builtinThemes: "標準のテーマ" diff --git a/migration/1557761316509-AddSomeUrls.ts b/migration/1557761316509-AddSomeUrls.ts index a0a2c7970..926999de6 100644 --- a/migration/1557761316509-AddSomeUrls.ts +++ b/migration/1557761316509-AddSomeUrls.ts @@ -4,8 +4,8 @@ export class AddSomeUrls1557761316509 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { await queryRunner.query(`ALTER TABLE "meta" ADD "ToSUrl" character varying(512)`); - await queryRunner.query(`ALTER TABLE "meta" ADD "repositoryUrl" character varying(512) NOT NULL DEFAULT 'https://github.com/syuilo/misskey'`); - await queryRunner.query(`ALTER TABLE "meta" ADD "feedbackUrl" character varying(512) DEFAULT 'https://github.com/syuilo/misskey/issues/new'`); + await queryRunner.query(`ALTER TABLE "meta" ADD "repositoryUrl" character varying(512) NOT NULL DEFAULT 'https://github.com/misskey-dev/misskey'`); + await queryRunner.query(`ALTER TABLE "meta" ADD "feedbackUrl" character varying(512) DEFAULT 'https://github.com/misskey-dev/misskey/issues/new'`); } public async down(queryRunner: QueryRunner): Promise { diff --git a/package.json b/package.json index ba41f0ddf..e6f3b71b7 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "misskey", "author": "syuilo ", - "version": "12.75.1", + "version": "12.76.0", "codename": "indigo", "repository": { "type": "git", - "url": "https://github.com/syuilo/misskey.git" + "url": "https://github.com/misskey-dev/misskey.git" }, "main": "./index.js", "private": true, @@ -88,6 +88,7 @@ "@types/parsimmon": "1.10.6", "@types/portscanner": "2.1.0", "@types/pug": "2.0.4", + "@types/punycode": "2.1.0", "@types/qrcode": "1.4.0", "@types/random-seed": "0.3.3", "@types/ratelimiter": "3.4.1", @@ -109,7 +110,7 @@ "@types/websocket": "1.0.2", "@types/ws": "7.4.0", "@typescript-eslint/parser": "4.18.0", - "@vue/compiler-sfc": "3.0.7", + "@vue/compiler-sfc": "3.0.8", "abort-controller": "3.0.0", "apexcharts": "3.26.0", "autobind-decorator": "2.4.0", @@ -180,6 +181,7 @@ "markdown-it": "12.0.4", "markdown-it-anchor": "7.1.0", "matter-js": "0.16.1", + "mfm-js": "0.14.0", "mocha": "8.3.2", "moji": "0.5.1", "ms": "2.1.3", @@ -190,7 +192,6 @@ "object-assign-deep": "0.4.0", "os-utils": "0.0.14", "parse5": "6.0.1", - "parsimmon": "1.16.0", "pg": "8.5.1", "portscanner": "2.2.0", "postcss": "8.2.8", @@ -245,13 +246,14 @@ "uuid": "8.3.2", "v-debounce": "0.1.2", "vanilla-tilt": "1.7.0", - "vue": "3.0.7", + "vue": "3.0.8", "vue-color": "2.8.1", "vue-json-pretty": "1.7.1", "vue-loader": "16.1.2", "vue-prism-editor": "2.0.0-alpha.2", "vue-router": "4.0.5", "vue-style-loader": "4.1.3", + "vue-svg-loader": "0.17.0-beta.2", "vuedraggable": "4.0.1", "web-push": "3.4.4", "webpack": "5.27.2", diff --git a/src/client/components/abuse-report-window.vue b/src/client/components/abuse-report-window.vue index 7dbb9657b..df5b594c0 100644 --- a/src/client/components/abuse-report-window.vue +++ b/src/client/components/abuse-report-window.vue @@ -8,19 +8,15 @@ -

+
-
- - {{ $ts.details }} - - -
+ + {{ $ts.details }} + +
-
- {{ $ts.send }} -
+ {{ $ts.send }}
@@ -80,6 +76,6 @@ export default defineComponent({ diff --git a/src/client/components/channel-preview.vue b/src/client/components/channel-preview.vue index e222ad7ae..4dc633bcb 100644 --- a/src/client/components/channel-preview.vue +++ b/src/client/components/channel-preview.vue @@ -123,7 +123,7 @@ export default defineComponent({ > footer { padding: 12px 16px; - border-top: solid 1px var(--divider); + border-top: solid 0.5px var(--divider); > span { opacity: 0.7; diff --git a/src/client/components/date-separated-list.vue b/src/client/components/date-separated-list.vue index be9f01ca1..433655d6e 100644 --- a/src/client/components/date-separated-list.vue +++ b/src/client/components/date-separated-list.vue @@ -37,14 +37,16 @@ export default defineComponent({ }); } + const noGap = [...document.querySelectorAll('._noGap_')].some(el => el.contains(this.$parent.$el)); + return h(this.$store.state.animation ? TransitionGroup : 'div', this.$store.state.animation ? { - class: 'sqadhkmv _list_', + class: 'sqadhkmv' + (noGap ? ' _block' : ''), name: 'list', tag: 'div', 'data-direction': this.direction, 'data-reversed': this.reversed ? 'true' : 'false', } : { - class: 'sqadhkmv _list_', + class: 'sqadhkmv', }, this.items.map((item, i) => { const el = this.$slots.default({ item: item @@ -117,11 +119,7 @@ export default defineComponent({ transform: translateY(-64px); } } -} - - diff --git a/src/client/components/drive.file.vue b/src/client/components/drive.file.vue index 03f2da008..fb8b50d25 100644 --- a/src/client/components/drive.file.vue +++ b/src/client/components/drive.file.vue @@ -330,8 +330,8 @@ export default defineComponent({ } > .thumbnail { - width: 128px; - height: 128px; + width: 110px; + height: 110px; margin: auto; } diff --git a/src/client/components/drive.vue b/src/client/components/drive.vue index 150d0d877..103ae9c11 100644 --- a/src/client/components/drive.vue +++ b/src/client/components/drive.vue @@ -11,7 +11,7 @@ {{ folder.name }}
-
.main { flex: 1; overflow: auto; + padding: var(--margin); &, * { user-select: none; @@ -735,7 +736,7 @@ export default defineComponent({ > .folder, > .file { flex-grow: 1; - width: 144px; + width: 128px; margin: 4px; box-sizing: border-box; } @@ -743,7 +744,7 @@ export default defineComponent({ > .padding { flex-grow: 1; pointer-events: none; - width: 144px + 8px; + width: 128px + 8px; } } diff --git a/src/client/components/emoji-picker-dialog.vue b/src/client/components/emoji-picker-dialog.vue index 5bdbc330a..c4b12e2f6 100644 --- a/src/client/components/emoji-picker-dialog.vue +++ b/src/client/components/emoji-picker-dialog.vue @@ -123,7 +123,7 @@ export default defineComponent({ > .index { min-height: var(--height); position: relative; - border-bottom: solid 1px var(--divider); + border-bottom: solid 0.5px var(--divider); > .arrow { position: absolute; @@ -181,7 +181,7 @@ export default defineComponent({ } &.result { - border-bottom: solid 1px var(--divider); + border-bottom: solid 0.5px var(--divider); &:empty { display: none; diff --git a/src/client/components/emoji-picker-window.vue b/src/client/components/emoji-picker-window.vue index 5504eaecd..53b6ae6b3 100644 --- a/src/client/components/emoji-picker-window.vue +++ b/src/client/components/emoji-picker-window.vue @@ -119,7 +119,7 @@ export default defineComponent({ > .index { min-height: var(--height); position: relative; - border-bottom: solid 1px var(--divider); + border-bottom: solid 0.5px var(--divider); > .arrow { position: absolute; @@ -177,7 +177,7 @@ export default defineComponent({ } &.result { - border-bottom: solid 1px var(--divider); + border-bottom: solid 0.5px var(--divider); &:empty { display: none; diff --git a/src/client/components/emoji-picker.vue b/src/client/components/emoji-picker.vue index 573833b9d..a212c1504 100644 --- a/src/client/components/emoji-picker.vue +++ b/src/client/components/emoji-picker.vue @@ -402,7 +402,7 @@ export default defineComponent({ > .tab { flex: 1; height: 38px; - border-top: solid 1px var(--divider); + border-top: solid 0.5px var(--divider); &.active { border-top: solid 1px var(--accent); @@ -425,7 +425,7 @@ export default defineComponent({ > div { &:not(.index) { padding: 4px 0 8px 0; - border-top: solid 1px var(--divider); + border-top: solid 0.5px var(--divider); } > header { @@ -492,7 +492,7 @@ export default defineComponent({ } &.result { - border-bottom: solid 1px var(--divider); + border-bottom: solid 0.5px var(--divider); &:empty { display: none; diff --git a/src/client/components/form/base.vue b/src/client/components/form/base.vue index 249b49c67..84438a5b3 100644 --- a/src/client/components/form/base.vue +++ b/src/client/components/form/base.vue @@ -20,12 +20,16 @@ export default defineComponent({ diff --git a/src/client/components/form/input.vue b/src/client/components/form/input.vue index f0aa6b053..c0fa3e716 100644 --- a/src/client/components/form/input.vue +++ b/src/client/components/form/input.vue @@ -215,7 +215,7 @@ export default defineComponent({ } > .input { - $height: 52px; + $height: 48px; position: relative; > input { diff --git a/src/client/components/form/link.vue b/src/client/components/form/link.vue index 2efc6b58c..af36bcf22 100644 --- a/src/client/components/form/link.vue +++ b/src/client/components/form/link.vue @@ -66,6 +66,7 @@ export default defineComponent({ &.active { color: var(--accent); + background: var(--panelHighlight); } > .icon { diff --git a/src/client/components/form/radios.vue b/src/client/components/form/radios.vue index 4561df32e..3daa7e5bb 100644 --- a/src/client/components/form/radios.vue +++ b/src/client/components/form/radios.vue @@ -69,8 +69,8 @@ export default defineComponent({ display: inline-block; vertical-align: bottom; position: relative; - width: 20px; - height: 20px; + width: 16px; + height: 16px; margin-right: 8px; background: none; border: 2px solid var(--inputBorder); diff --git a/src/client/components/form/range.vue b/src/client/components/form/range.vue index 3452184c5..65d665c70 100644 --- a/src/client/components/form/range.vue +++ b/src/client/components/form/range.vue @@ -69,7 +69,7 @@ export default defineComponent({ position: relative; > .main { - padding: 24px 16px; + padding: 22px 16px; > input { display: block; diff --git a/src/client/components/form/select.vue b/src/client/components/form/select.vue index b865372f5..01f28587d 100644 --- a/src/client/components/form/select.vue +++ b/src/client/components/form/select.vue @@ -97,7 +97,7 @@ export default defineComponent({ font: inherit; font-weight: normal; font-size: 1em; - height: 52px; + height: 48px; background: none; border: none; border-radius: 0; diff --git a/src/client/components/form/switch.vue b/src/client/components/form/switch.vue index a2941c599..e7ef714c4 100644 --- a/src/client/components/form/switch.vue +++ b/src/client/components/form/switch.vue @@ -57,7 +57,7 @@ export default defineComponent({ > .main { position: relative; display: flex; - padding: 16px; + padding: 14px 16px; cursor: pointer; > * { diff --git a/src/client/components/global/a.vue b/src/client/components/global/a.vue index a8a597b2b..7ad62a731 100644 --- a/src/client/components/global/a.vue +++ b/src/client/components/global/a.vue @@ -93,6 +93,10 @@ export default defineComponent({ os.pageWindow(this.to); }, + modalWindow() { + os.modalPageWindow(this.to); + }, + popout() { popout(this.to); }, @@ -111,6 +115,8 @@ export default defineComponent({ if (this.behavior) { if (this.behavior === 'window') { return this.window(); + } else if (this.behavior === 'modalWindow') { + return this.modalWindow(); } } diff --git a/src/client/components/global/acct.vue b/src/client/components/global/acct.vue index a969636a7..70f2954cb 100644 --- a/src/client/components/global/acct.vue +++ b/src/client/components/global/acct.vue @@ -1,5 +1,5 @@