diff --git a/.dockerignore b/.dockerignore index bab808cd62..e16333fb2a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,6 +5,7 @@ .vscode Dockerfile build/ +built/ db/ docker-compose.yml elasticsearch/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 559e2d8f62..cece4c4ec5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,43 @@ ChangeLog ========= + +12.46.0 (2020/8/2) +------------------ + +### ✨Improvements + +- チャットでCmd+Enterショートカットが使用できない問題を修正 [#6614](https://github.com/syuilo/misskey/pull/6614) +- サイドバーを折り畳めるように [#6610](https://github.com/syuilo/misskey/pull/6610) + +### 🐛Fixes +- お知らせを既読にできない問題を修正 [9008664](https://github.com/syuilo/misskey/commit/9008664606483e2902f03929f0f696ac43de6db4) +- シンタックスハイライト構文が壊れている問題を修正 [60736ba](https://github.com/syuilo/misskey/commit/60736bab2ac974c2d2c2c106d297fa67fdaff87a) + +12.45.1 (2020/8/1) +------------------- + +### ✨Improvements +- 自分のノートにリアクションを押せるように [#6506](https://github.com/syuilo/misskey/pull/6506) +- 非ログイン時にウェルカムメッセージが被る問題を修正 [#6509](https://github.com/syuilo/misskey/pull/6509) + +### 🐛Fixes +- 最新の投票結果がタイムラインなどに反映されない問題を修正 [2522e73](https://github.com/syuilo/misskey/commit/2522e7388d4d0b92d4517f2c07190e8f88394026) + + +12.45.0 (2020/7/30) +------------------- + +### ✨Improvements +- プラグインのIDを不要に [57203de](https://github.com/syuilo/misskey/commit/57203de4cbf3947825f422dd746a076d79e353c7) +- プラグインの設定にdescriptionを表示できるように [9eee564](https://github.com/syuilo/misskey/commit/9eee5644b9b112ed6d8863edce569f4d554459f5) +- AiScript: Plugin:register_note_post_interruptor 関数を追加(ノート作成時の割り込み処理を登録できる) [e7de5f6](https://github.com/syuilo/misskey/commit/e7de5f60513774e9c599a2e3aac0fbeefb88236f) +- AiScript: Plugin:open_url 関数を追加 [60d81d7](https://github.com/syuilo/misskey/commit/60d81d74e35879f52a374d5e35fe25dc115d75a4) + +### 🐛Fixes +- 通知のノートがリアクティブではない問題を修正 [2701a7e](https://github.com/syuilo/misskey/commit/2701a7e85fcf745e75b46b88b0fc9b3f76218e44) +- ピン留めされたノートがリアクティブではない問題を修正 [31a0afd](https://github.com/syuilo/misskey/commit/31a0afdaab309cd2e9fd22f0524730488202704d) +- プラグインの設定がnullになることがある問題を修正 [01e9b3c](https://github.com/syuilo/misskey/commit/01e9b3c2f634f37cee6820ca25d7576ef3ab6442) + 12.44.1 (2020/7/29) ------------------- ### 🐛Fixes diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml index fc41376954..a12d42e195 100644 --- a/locales/ar-SA.yml +++ b/locales/ar-SA.yml @@ -351,6 +351,9 @@ pluginInstallWarn: "يرجى تنصيب إضافات ذات مصدر موثوق smtpHost: "المضيف" smtpUser: "اسم المستخدم" smtpPass: "الكلمة السرية" +_sidebar: + icon: "الصورة الرمزية" + hide: "إخفاء" _theme: explore: "استكشف قوالب المظهر" install: "تنصيب قالب" diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 8485f3bd0e..bd24dee136 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -556,6 +556,11 @@ testEmail: "Email-Versand testen" wordMute: "Wort-Stummschaltung" userSaysSomething: "{name} hat etwas gesagt." makeActive: "Aktivieren" +display: "Anzeige" +_sidebar: + full: "Voll" + icon: "Profilbild" + hide: "Ausblenden" _wordMute: muteWords: "Wort stummschalten" muteWordsDescription: "Mit Leerzeichen für eine \"UND\"-Verknüpfung trennen, durch Zeilenumbrüche für eine \"ODER\"-Verknüpfung trennen." diff --git a/locales/en-US.yml b/locales/en-US.yml index aa4ada2b85..b83c1048c7 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -556,6 +556,11 @@ testEmail: "Test email delivery" wordMute: "Word mute" userSaysSomething: "{name} said something" makeActive: "Activate" +display: "Display" +_sidebar: + full: "Full" + icon: "Avatar" + hide: "Hide" _wordMute: muteWords: "Word to mute" muteWordsDescription: "Separate with spaces for AND condition. Separate with line breaks for OR." diff --git a/locales/es-ES.yml b/locales/es-ES.yml index cc5d468816..281406a5cc 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -104,6 +104,8 @@ unblockConfirm: "¿Quiere dejar de bloquear esta cuenta?" suspendConfirm: "¿Quiere suspender esta cuenta?" unsuspendConfirm: "¿Quiere dejar de suspender esta cuenta?" selectList: "Seleccione una lista" +selectAntenna: "Seleccionar antena" +selectWidget: "Seleccionar widget" customEmojis: "Emojis personalizados" emoji: "Emoji" emojiName: "Nombre del emoji" @@ -535,6 +537,8 @@ enableAll: "Activar todo" disableAll: "Desactivar todo" tokenRequested: "Permiso de acceso a la cuenta" pluginTokenRequestedDescription: "Este plugin podrá usar los permisos descritos aquí" +notificationType: "Tipo de notificación" +edit: "Editar" useStarForReactionFallback: "En caso de que los emojis de reacciones no sean claros, usar en su lugar una estrella" emailConfig: "Configuración del servidor de correos" enableEmail: "Activar el envío de correos electrónicos" @@ -549,6 +553,20 @@ emptyToDisableSmtpAuth: "Deje el nombre del usuario y la contraseña en blanco p smtpSecure: "Usar SSL/TLS implícito en la conexión SMTP" smtpSecureInfo: "Apagar cuando se use STARTTLS" testEmail: "Prueba de envío" +wordMute: "Silenciar palabras" +userSaysSomething: "{name} dijo algo" +makeActive: "Activar" +_sidebar: + icon: "Avatar" + hide: "Ocultar" +_wordMute: + muteWords: "Palabras que silenciar" + muteWordsDescription: "Separar con espacios indica una declaracion And, separar con lineas nuevas indica una declaracion Or。" + muteWordsDescription2: "Encerrar las palabras clave entre numerales para usar expresiones regulares" + softDescription: "Ocultar en la linea de tiempo las notas que cumplen las condiciones" + hardDescription: "Evitar que se agreguen a la linea de tiempo las notas que cumplen las condiciones. Las notas no agregadas seguirán quitadas aunque cambien las condiciones." + soft: "Suave" + hard: "Duro" _theme: explore: "Explorar temas" install: "Instalar tema" @@ -1189,15 +1207,25 @@ _notification: yourFollowRequestAccepted: "Tu solicitud de seguimiento fue aceptada" youWereInvitedToGroup: "Invitado al grupo" _types: + all: "Todo" follow: "Siguiendo" mention: "Menciones" + reply: "Respuestas" renote: "Renotar" quote: "Citar" reaction: "Reacción" + pollVote: "Encuestas" + receiveFollowRequest: "Solicitudes de seguimiento" _deck: alwaysShowMainColumn: "Siempre mostrar la columna principal" columnAlign: "Alinear columnas" addColumn: "Agregar columna" + swapLeft: "Mover a la izquierda" + swapRight: "Mover a la derecha" + swapUp: "Mover arriba" + swapDown: "Mover abajo" + stackLeft: "Apilar a la izquierda" + popRight: "Sacar a la derecha" _columns: widgets: "Widgets" notifications: "Notificaciones" diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index b4aa5513a7..c26619495c 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -543,6 +543,9 @@ emailConfig: "Configuration du serveur email" smtpHost: "Hôte" smtpUser: "Nom d’utilisateur·rice" smtpPass: "Mot de passe" +_sidebar: + icon: "Avatar" + hide: "Masquer" _theme: explore: "Explorer les thèmes" install: "Installer un thème" diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 06b53f26a0..d3891a41a6 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -556,6 +556,13 @@ testEmail: "配信テスト" wordMute: "ワードミュート" userSaysSomething: "{name}が何かを言いました" makeActive: "アクティブにする" +display: "表示" +copy: "コピー" + +_sidebar: + full: "フル" + icon: "アイコン" + hide: "隠す" _wordMute: muteWords: "ミュートするワード" diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml index b12c3d45e0..1b32cb772e 100644 --- a/locales/ja-KS.yml +++ b/locales/ja-KS.yml @@ -356,6 +356,8 @@ invites: "来てや" smtpHost: "ホスト" smtpUser: "ユーザー名" smtpPass: "パスワード" +_sidebar: + icon: "アイコン" _theme: keys: renote: "Renote" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 51e4c618e0..1974fd49b7 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -104,6 +104,8 @@ unblockConfirm: "이 계정의 차단을 해제하시겠습니까?" suspendConfirm: "이 계정을 정지하시겠습니까?" unsuspendConfirm: "이 계정의 정지를 해제하시겠습니까?" selectList: "리스트 선택" +selectAntenna: "안테나 선택" +selectWidget: "위젯 선택" customEmojis: "커스텀 이모지" emoji: "이모지" emojiName: "이모지 이름" @@ -432,7 +434,7 @@ tags: "태그" docSource: "이 문서의 소스" createAccount: "계정 만들기" existingAcount: "기존 계정" -regenerate: "다시 생성" +regenerate: "재생성" fontSize: "글자 크기" noFollowRequests: "처리되지 않은 팔로우 요청이 없습니다" openImageInNewTab: "새 탭에서 이미지 열기" @@ -527,9 +529,25 @@ plugins: "플러그인" pluginInstallWarn: "신뢰할 수 없는 플러그인은 설치하지 마십시오." deck: "덱" undeck: "덱 해제" +generateAccessToken: "액세스 토큰 생성" +permission: "권한" +enableAll: "전체 선택" +disableAll: "전체 해제" +edit: "편집" +useStarForReactionFallback: "알 수 없는 리액션 이모지 대신 ★ 사용" +email: "메일 주소" +smtpConfig: "SMTP 서버 설정" smtpHost: "호스트" smtpUser: "유저명" smtpPass: "비밀번호" +emptyToDisableSmtpAuth: "SMTP 인증을 사용하지 않으려면 공란으로 비워둡니다." +smtpSecureInfo: "STARTTLS 사용 시에는 해제합니다." +wordMute: "단어 뮤트" +_sidebar: + icon: "아바타" + hide: "숨기기" +_wordMute: + muteWords: "뮤트할 단어" _theme: explore: "테마 찾아보기" install: "테마 설치" @@ -1127,6 +1145,12 @@ _notification: quote: "인용" reaction: "리액션" _deck: + swapLeft: "왼쪽으로 이동" + swapRight: "오른쪽으로 이동" + swapUp: "위로 이동" + swapDown: "아래로 이동" + stackLeft: "왼쪽에 쌓기" + popRight: "오른쪽으로 빼기" _columns: widgets: "위젯" notifications: "알림" diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index d0ad7e8f3a..930f4185c7 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -104,6 +104,7 @@ unblockConfirm: "确定要解除屏蔽吗？" suspendConfirm: "要冻结吗？" unsuspendConfirm: "要解除冻结吗？" selectList: "选择列表" +selectAntenna: "天线选择" selectWidget: "选择小工具" customEmojis: "自定义Emoji" emoji: "表情符号" @@ -552,6 +553,19 @@ emptyToDisableSmtpAuth: "用户名和密码留空可以禁用SMTP验证" smtpSecure: "在 SMTP 连接中使用隐式 SSL / TLS" smtpSecureInfo: "使用STARTTLS时关闭。" testEmail: "邮件发送测试" +wordMute: "文字屏蔽" +userSaysSomething: "{name}说了什么" +makeActive: "激活" +display: "显示" +_sidebar: + icon: "头像" + hide: "隐藏" +_wordMute: + muteWords: "禁用词" + muteWordsDescription: "使用空格分隔表示AND逻辑，使用换行符分隔表示OR逻辑。" + muteWordsDescription2: "将关键字用斜线括起来表示正则表达式。" + softDescription: "隐藏时间轴中指定条件的帖文。" + hardDescription: "防止将具有指定条件的帖文添加到时间线。 即使您更改条件，未添加的帖文也会被排除在外。" _theme: explore: "寻找主题" install: "安装主题" @@ -1192,15 +1206,25 @@ _notification: yourFollowRequestAccepted: "您的关注请求已通过" youWereInvitedToGroup: "您有新的群组邀请" _types: + all: "全部" follow: "关注中" mention: "提及" + reply: "回复" renote: "转发" quote: "引用" reaction: "回应" + pollVote: "投票" + receiveFollowRequest: "关注请求" _deck: alwaysShowMainColumn: "总是显示主列" columnAlign: "列对齐" addColumn: "添加列" + swapLeft: "向左移动" + swapRight: "向右移动" + swapUp: "向上移动" + swapDown: "向下移动" + stackLeft: "向左折叠" + popRight: "向右弹出" _columns: widgets: "小工具" notifications: "通知" diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index bebe468e7f..82dd24b7b9 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -409,6 +409,8 @@ deletedNote: "已删除的貼文" smtpHost: "主機" smtpUser: "使用名稱" smtpPass: "密碼" +_sidebar: + icon: "頭像" _theme: func: "函数" keys: diff --git a/package.json b/package.json index ddf67f7560..b242b63006 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "12.45.0", + "version": "12.46.0", "codename": "indigo", "repository": { "type": "git", @@ -36,21 +36,21 @@ "mocha/serialize-javascript": "^3.1.0" }, "dependencies": { - "@babel/plugin-transform-runtime": "7.10.3", + "@babel/plugin-transform-runtime": "7.11.0", "@elastic/elasticsearch": "7.8.0", - "@fortawesome/fontawesome-svg-core": "1.2.29", - "@fortawesome/free-brands-svg-icons": "5.13.1", - "@fortawesome/free-regular-svg-icons": "5.13.1", - "@fortawesome/free-solid-svg-icons": "5.13.1", + "@fortawesome/fontawesome-svg-core": "1.2.30", + "@fortawesome/free-brands-svg-icons": "5.14.0", + "@fortawesome/free-regular-svg-icons": "5.14.0", + "@fortawesome/free-solid-svg-icons": "5.14.0", "@fortawesome/vue-fontawesome": "0.1.10", "@koa/cors": "3.1.0", "@koa/multer": "3.0.0", "@koa/router": "9.0.1", "@sinonjs/fake-timers": "6.0.1", - "@syuilo/aiscript": "0.10.0", + "@syuilo/aiscript": "0.11.0", "@types/bcryptjs": "2.4.2", "@types/bull": "3.14.0", - "@types/cbor": "5.0.0", + "@types/cbor": "5.0.1", "@types/dateformat": "3.0.1", "@types/double-ended-queue": "2.1.1", "@types/escape-regexp": "0.0.0", @@ -107,16 +107,16 @@ "@typescript-eslint/parser": "3.6.0", "@vue/compiler-sfc": "3.0.0-rc.2", "abort-controller": "3.0.0", - "apexcharts": "3.19.3", + "apexcharts": "3.20.0", "autobind-decorator": "2.4.0", "autosize": "4.0.2", "autwh": "0.1.0", - "aws-sdk": "2.713.0", + "aws-sdk": "2.724.0", "bcryptjs": "2.4.3", "blurhash": "1.1.3", - "bull": "3.15.0", + "bull": "3.16.0", "cafy": "15.2.1", - "cbor": "5.0.2", + "cbor": "5.1.0", "chalk": "4.1.0", "chart.js": "2.9.3", "cli-highlight": "2.1.4", @@ -124,7 +124,7 @@ "content-disposition": "0.5.3", "core-js": "3.6.5", "crc-32": "1.2.0", - "css-loader": "3.6.0", + "css-loader": "4.2.1", "cssnano": "4.1.10", "dateformat": "3.0.3", "deep-entries": "3.1.0", @@ -136,7 +136,7 @@ "eventemitter3": "4.0.4", "feed": "4.2.1", "fibers": "5.0.0", - "file-type": "14.6.2", + "file-type": "14.7.1", "fluent-ffmpeg": "2.1.2", "glob": "7.1.6", "gulp": "4.0.2", @@ -145,7 +145,7 @@ "gulp-rename": "2.0.0", "gulp-replace": "1.0.0", "gulp-sourcemaps": "2.6.5", - "gulp-terser": "1.2.0", + "gulp-terser": "1.3.2", "gulp-tslint": "8.1.4", "gulp-typescript": "6.0.0-alpha.1", "hard-source-webpack-plugin": "0.13.1", @@ -164,7 +164,7 @@ "json5-loader": "4.0.0", "jsonld": "3.1.1", "jsrsasign": "8.0.20", - "katex": "0.11.1", + "katex": "0.12.0", "koa": "2.13.0", "koa-bodyparser": "4.3.0", "koa-favicon": "2.1.0", @@ -178,31 +178,30 @@ "lookup-dns-cache": "2.1.0", "markdown-it": "11.0.0", "markdown-it-anchor": "5.3.0", - "mocha": "8.0.1", + "mocha": "8.1.1", "moji": "0.5.1", "ms": "2.1.2", "multer": "1.4.2", "nested-property": "2.0.1", "node-fetch": "2.6.0", - "nodemailer": "6.4.10", + "nodemailer": "6.4.11", "nprogress": "0.2.0", "object-assign-deep": "0.4.0", "os-utils": "0.0.14", - "parse5": "6.0.0", - "parsimmon": "1.14.0", + "parse5": "6.0.1", + "parsimmon": "1.15.0", "pg": "8.3.0", "portscanner": "2.2.0", "postcss-loader": "3.0.0", - "prismjs": "1.20.0", + "prismjs": "1.21.0", "probe-image-size": "5.0.0", "promise-limit": "2.7.0", "promise-sequential": "1.1.1", "pug": "2.0.4", "punycode": "2.1.1", - "pureimage": "0.2.1", + "pureimage": "0.2.4", "qrcode": "1.4.4", "random-seed": "0.3.0", - "randomcolor": "0.5.4", "ratelimiter": "3.4.1", "re2": "1.15.4", "recaptcha-promise": "0.1.3", @@ -210,7 +209,7 @@ "redis": "3.0.2", "redis-lock": "0.1.4", "reflect-metadata": "0.1.13", - "regenerator-runtime": "0.13.5", + "regenerator-runtime": "0.13.7", "rename": "1.0.4", "request-stats": "3.0.0", "require-all": "3.0.0", @@ -218,7 +217,7 @@ "rndstr": "1.0.0", "s-age": "1.1.2", "sass": "1.26.10", - "sass-loader": "9.0.2", + "sass-loader": "9.0.3", "seedrandom": "3.0.5", "sharp": "0.25.4", "speakeasy": "2.0.0", @@ -226,35 +225,35 @@ "style-loader": "1.2.1", "summaly": "2.4.0", "syslog-pro": "1.0.0", - "systeminformation": "4.26.9", + "systeminformation": "4.26.10", "syuilo-password-strength": "0.0.1", "textarea-caret": "3.1.0", "three": "0.117.1", "tinycolor2": "1.4.1", "tmp": "0.2.1", - "ts-loader": "8.0.0", + "ts-loader": "8.0.2", "ts-node": "8.10.2", - "tslint": "6.1.2", + "tslint": "6.1.3", "tslint-sonarts": "1.9.0", "typeorm": "0.2.25", - "typescript": "3.9.6", + "typescript": "3.9.7", "ulid": "2.3.0", "url-loader": "4.1.0", - "uuid": "8.2.0", + "uuid": "8.3.0", "v-animate-css": "0.0.3", "v-debounce": "0.1.2", - "vue": "3.0.0-rc.5", + "vue": "git+https://github.com/vuejs/vue-next.git#ed4381020fcea0494f19f11bebabd9108f2dafd7", "vue-color": "2.7.1", "vue-content-loading": "1.6.0", "vue-cropperjs": "4.1.0", "vue-i18n": "9.0.0-alpha.11", - "vue-json-pretty": "1.6.5", + "vue-json-pretty": "1.6.7", "vue-loader": "16.0.0-beta.4", "vue-marquee-text-component": "1.1.1", "vue-meta": "2.4.0", "vue-prism-component": "1.2.0", "vue-prism-editor": "0.6.1", - "vue-router": "4.0.0-beta.3", + "vue-router": "4.0.0-beta.6", "vue-style-loader": "4.1.2", "vue-svg-inline-loader-corejs3": "1.5.0", "vue-template-compiler": "2.6.11", @@ -262,7 +261,7 @@ "vuex": "4.0.0-beta.4", "vuex-persistedstate": "3.0.1", "web-push": "3.4.4", - "webpack": "5.0.0-beta.22", + "webpack": "git+https://github.com/webpack/webpack.git#c1237eae912817c7546e8c54489f7adb60bfbe38", "webpack-cli": "3.3.12", "websocket": "1.0.31", "ws": "7.3.1", diff --git a/src/client/components/mention.vue b/src/client/components/mention.vue index ced8fe8098..2d07337e3d 100644 --- a/src/client/components/mention.vue +++ b/src/client/components/mention.vue @@ -18,6 +18,7 @@ import { defineComponent } from 'vue'; import { toUnicode } from 'punycode'; import { host as localHost } from '../config'; +import { wellKnownServices } from '../../well-known-services'; export default defineComponent({ props: { @@ -37,12 +38,11 @@ export default defineComponent({ }, computed: { url(): string { - switch (this.host) { - case 'twitter.com': - case 'github.com': - return `https://${this.host}/${this.username}`; - default: - return `/${this.canonical}`; + const wellKnown = wellKnownServices.find(x => x[0] === this.host); + if (wellKnown) { + return wellKnown[1](this.username); + } else { + return `/${this.canonical}`; } }, canonical(): string { diff --git a/src/client/components/sidebar.vue b/src/client/components/sidebar.vue index c216aa18a8..7c48f6c5cb 100644 --- a/src/client/components/sidebar.vue +++ b/src/client/components/sidebar.vue @@ -9,7 +9,7 @@ -