From 6dac505af9a39182facb86c9c29957b529e00619 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 22 Aug 2020 08:03:11 +0900 Subject: [PATCH 1/5] Update dependencies :rocket: --- package.json | 30 +- src/client/pages/page-editor/page-editor.vue | 16 +- src/client/pages/scratchpad.vue | 16 +- src/client/style.scss | 13 + yarn.lock | 277 +++++++++---------- 5 files changed, 188 insertions(+), 164 deletions(-) diff --git a/package.json b/package.json index 736f05eb20..2f46cec1dc 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "aws-sdk": "2.724.0", "bcryptjs": "2.4.3", "blurhash": "1.1.3", - "bull": "3.16.0", + "bull": "3.18.0", "cafy": "15.2.1", "cbor": "5.1.0", "chalk": "4.1.0", @@ -158,7 +158,7 @@ "is-root": "2.1.0", "is-svg": "4.2.1", "js-yaml": "3.14.0", - "jsdom": "16.3.0", + "jsdom": "16.4.0", "json5": "2.1.3", "json5-loader": "4.0.0", "jsonld": "3.1.1", @@ -189,7 +189,7 @@ "os-utils": "0.0.14", "parse5": "6.0.1", "parsimmon": "1.15.0", - "pg": "8.3.0", + "pg": "8.3.2", "portal-vue": "2.1.7", "portscanner": "2.2.0", "postcss-loader": "3.0.0", @@ -199,7 +199,7 @@ "promise-sequential": "1.1.1", "pug": "2.0.4", "punycode": "2.1.1", - "pureimage": "0.2.4", + "pureimage": "0.2.5", "qrcode": "1.4.4", "random-seed": "0.3.0", "ratelimiter": "3.4.1", @@ -225,43 +225,43 @@ "style-loader": "1.2.1", "summaly": "2.4.0", "syslog-pro": "1.0.0", - "systeminformation": "4.26.10", + "systeminformation": "4.26.12", "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.2", - "ts-node": "8.10.2", + "ts-node": "9.0.0", "tslint": "6.1.3", "tslint-sonarts": "1.9.0", "typeorm": "0.2.25", - "typescript": "3.9.7", + "typescript": "4.0.2", "ulid": "2.3.0", "url-loader": "4.1.0", "uuid": "8.3.0", "v-animate-css": "0.0.3", "v-debounce": "0.1.2", - "vue": "2.6.11", + "vue": "2.6.12", "vue-color": "2.7.1", "vue-content-loading": "1.6.0", "vue-cropperjs": "4.1.0", - "vue-i18n": "8.20.0", + "vue-i18n": "8.21.0", "vue-json-pretty": "1.6.7", "vue-loader": "15.9.3", "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": "3.4.2", + "vue-prism-editor": "1.2.2", + "vue-router": "3.4.3", "vue-style-loader": "4.1.2", "vue-svg-inline-loader-corejs3": "1.5.0", - "vue-template-compiler": "2.6.11", - "vuedraggable": "2.24.0", + "vue-template-compiler": "2.6.12", + "vuedraggable": "2.24.1", "vuex": "3.5.1", - "vuex-persistedstate": "3.0.1", + "vuex-persistedstate": "3.1.0", "web-push": "3.4.4", - "webpack": "git+https://github.com/webpack/webpack.git#c1237eae912817c7546e8c54489f7adb60bfbe38", + "webpack": "5.0.0-beta.28", "webpack-cli": "3.3.12", "websocket": "1.0.31", "ws": "7.3.1", diff --git a/src/client/pages/page-editor/page-editor.vue b/src/client/pages/page-editor/page-editor.vue index 2beb2df389..8f09ccec33 100644 --- a/src/client/pages/page-editor/page-editor.vue +++ b/src/client/pages/page-editor/page-editor.vue @@ -76,7 +76,7 @@
- +
@@ -85,9 +85,13 @@ diff --git a/src/client/pages/scratchpad.vue b/src/client/pages/scratchpad.vue index 025505295b..d14d4452bf 100644 --- a/src/client/pages/scratchpad.vue +++ b/src/client/pages/scratchpad.vue @@ -4,7 +4,7 @@ {{ $t('scratchpad') }}
- +
@@ -24,9 +24,13 @@ diff --git a/src/client/style.scss b/src/client/style.scss index 2d23f81213..4e0baf63cf 100644 --- a/src/client/style.scss +++ b/src/client/style.scss @@ -448,6 +448,19 @@ hr { opacity: 0.7; } +._code { + background: #2d2d2d; + color: #ccc; + font-family: Fira code, Fira Mono, Consolas, Menlo, Courier, monospace; + font-size: 14px; + line-height: 1.5; + padding: 5px; +} + +.prism-editor__textarea:focus { + outline: none; +} + .zoom-enter-active, .zoom-leave-active { transition: opacity 0.5s, transform 0.5s !important; } diff --git a/yarn.lock b/yarn.lock index ee61e1cecf..3fe0ae5667 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1185,11 +1185,16 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg== -acorn@^7.2.0, acorn@^7.3.0: +acorn@^7.2.0: version "7.3.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd" integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA== +acorn@^7.4.0: + version "7.4.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c" + integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w== + agent-base@6: version "6.0.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.0.tgz#5d0101f19bbfaed39980b22ae866de153b93f09a" @@ -1811,21 +1816,21 @@ builtin-modules@^1.1.1: resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= -bull@3.16.0: - version "3.16.0" - resolved "https://registry.yarnpkg.com/bull/-/bull-3.16.0.tgz#adabb8404ebecedfbe4f3b9b2163e249de1915ff" - integrity sha512-5RAeKPJwhzuk5y4TL5ys+mX1p1r8TOKUF537c2VFVqg0Z+Y2zL1gXfgk0OAlIhD+9E/q3BgRvN96AxUz6nfBDA== +bull@3.18.0: + version "3.18.0" + resolved "https://registry.yarnpkg.com/bull/-/bull-3.18.0.tgz#7d7730c8ab0975ea9ee4e74f6f85bd731c3526cb" + integrity sha512-nE/BKlg1dnJ/AcOy5D1nzthcmpAKqpUVXzQ43mJfnVC8ZM7mi4ZzP3spN7745UuikzmGGsbTe9px2TbEKhR+DQ== dependencies: cron-parser "^2.13.0" debuglog "^1.0.0" get-port "^5.1.1" ioredis "^4.14.1" - lodash "^4.17.15" + lodash "^4.17.19" p-timeout "^3.2.0" promise.prototype.finally "^3.1.2" - semver "^6.3.0" + semver "^7.3.2" util.promisify "^1.0.1" - uuid "^8.2.0" + uuid "^8.3.0" busboy@^0.2.11: version "0.2.14" @@ -1840,17 +1845,17 @@ bytes@3.1.0, bytes@^3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -cacache@^15.0.4: - version "15.0.4" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.4.tgz#b2c23cf4ac4f5ead004fb15a0efb0a20340741f1" - integrity sha512-YlnKQqTbD/6iyoJvEY3KJftjrdBYroCbxxYXzhOzsFLWlp6KX4BOlEf4mTx0cMUfVaTS3ENL2QtDWeRYoGLkkw== +cacache@^15.0.5: + version "15.0.5" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0" + integrity sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A== dependencies: "@npmcli/move-file" "^1.0.1" chownr "^2.0.0" fs-minipass "^2.0.0" glob "^7.1.4" infer-owner "^1.0.4" - lru-cache "^5.1.1" + lru-cache "^6.0.0" minipass "^3.1.1" minipass-collect "^1.0.2" minipass-flush "^1.0.5" @@ -2404,16 +2409,6 @@ component-emitter@^1.2.1: resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== -component-props@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/component-props/-/component-props-1.1.1.tgz#f9b7df9b9927b6e6d97c9bd272aa867670f34944" - integrity sha1-+bffm5kntubZfJvScqqGdnDzSUQ= - -component-xor@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/component-xor/-/component-xor-0.0.4.tgz#c55d83ccc1b94cd5089a4e93fa7891c7263e59aa" - integrity sha1-xV2DzMG5TNUImk6T+niRxyY+Wao= - concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -3057,14 +3052,6 @@ doctypes@^1.1.0: resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9" integrity sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk= -dom-iterator@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dom-iterator/-/dom-iterator-1.0.0.tgz#9c09899846ec41c2d257adc4d6015e4759ef05ad" - integrity sha512-7dsMOQI07EMU98gQM8NSB3GsAiIeBYIPKpnxR3c9xOvdvBjChAcOM0iJ222I3p5xyiZO9e5oggkNaCusuTdYig== - dependencies: - component-props "1.1.1" - component-xor "0.0.4" - dom-serializer@0: version "0.2.2" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" @@ -3578,10 +3565,10 @@ events@1.1.1: resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= -events@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" - integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== +events@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" + integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== execa@^1.0.0: version "1.0.0" @@ -4150,12 +4137,12 @@ good-listener@^1.2.2: dependencies: delegate "^3.1.2" -graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: +graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: version "4.2.3" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== -graceful-fs@^4.2.3: +graceful-fs@^4.2.3, graceful-fs@^4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== @@ -5150,11 +5137,12 @@ iterate-value@^1.0.0: es-get-iterator "^1.0.2" iterate-iterator "^1.0.1" -jest-worker@^26.0.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.1.0.tgz#65d5641af74e08ccd561c240e7db61284f82f33d" - integrity sha512-Z9P5pZ6UC+kakMbNJn+tA2RdVdNX5WH1x+5UCBZ9MxIK24pjYtFt96fK+UwBTrjLYm232g1xz0L3eTh51OW+yQ== +jest-worker@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f" + integrity sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw== dependencies: + "@types/node" "*" merge-stream "^2.0.0" supports-color "^7.0.0" @@ -5215,10 +5203,10 @@ jschardet@^2.1.0: resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-2.1.1.tgz#af6f8fd0b3b0f5d46a8fd9614a4fce490575c184" integrity sha512-pA5qG9Zwm8CBpGlK/lo2GE9jPxwqRgMV7Lzc/1iaPccw6v4Rhj8Zg2BTyrdmHmxlJojnbLupLeRnaPLsq03x6Q== -jsdom@16.3.0: - version "16.3.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.3.0.tgz#75690b7dac36c67be49c336dcd7219bbbed0810c" - integrity sha512-zggeX5UuEknpdZzv15+MS1dPYG0J/TftiiNunOeNxSl3qr8Z6cIlQpN0IdJa44z9aFxZRIVqRncvEhQ7X5DtZg== +jsdom@16.4.0: + version "16.4.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb" + integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w== dependencies: abab "^2.0.3" acorn "^7.1.1" @@ -5845,6 +5833,13 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + lru-queue@0.1: version "0.1.0" resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3" @@ -6041,7 +6036,7 @@ mime-db@1.44.0: resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== -mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.26, mime-types@~2.1.19, mime-types@~2.1.24: +mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.26, mime-types@^2.1.27, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.27" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== @@ -6266,11 +6261,6 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -neo-async@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" - integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== - neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" @@ -6697,10 +6687,10 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.1.tgz#584784ac0722d1aed09f19f90ed2999af6ce2839" - integrity sha512-mw/p92EyOzl2MhauKodw54Rx5ZK4624rNfgNaBguFZkHzyUG9WsDzFF5/yQVEJinbJDdP4jEfMN+uBquiGnaLg== +p-limit@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe" + integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg== dependencies: p-try "^2.0.0" @@ -6958,10 +6948,10 @@ pg-types@^2.1.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -pg@8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.3.0.tgz#941383300d38eef51ecb88a0188cec441ab64d81" - integrity sha512-jQPKWHWxbI09s/Z9aUvoTbvGgoj98AU7FDCcQ7kdejupn/TcNpx56v2gaOTzXkzOajmOEJEdi9eTh9cA2RVAjQ== +pg@8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.3.2.tgz#52766e41302f5b878fe1efa10d4cdd486f6dff50" + integrity sha512-hOoRCTriXS+VWwyXHchRjWb9yv3Koq8irlwwXniqhdgK0AbfWvEnybGS2HIUE+UdCSTuYAM4WGPujFpPg9Vcaw== dependencies: buffer-writer "2.0.0" packet-reader "1.0.0" @@ -7734,10 +7724,10 @@ punycode@^1.4.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= -pureimage@0.2.4: - version "0.2.4" - resolved "https://registry.yarnpkg.com/pureimage/-/pureimage-0.2.4.tgz#7084e6de202beea1b2a4723545efce19266f5cfb" - integrity sha512-8/KkBM3nkUixfjFNw59UQJJ2HFIfiBgL3Cwxtrc9ObVe8yjcUfc/8ZCG0tbQ0qVjnlsCMq6binBueYbIlCb4qA== +pureimage@0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/pureimage/-/pureimage-0.2.5.tgz#10c9d314bcdfba712229ec70c3849164f537c248" + integrity sha512-D/oP8uaS8HLIOPqaxeVU0ZcJHUwvvFjeclKwn0RBeZJn3TBtZgKn7FVBN5auuCHQTC4K/wDAHfkY/JOuGCiohQ== dependencies: jpeg-js "^0.4.1" opentype.js "^0.4.3" @@ -8358,7 +8348,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.6.6: +schema-utils@^2.6.5, schema-utils@^2.6.6: version "2.6.6" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz#299fe6bd4a3365dc23d99fd446caff8f1d6c330c" integrity sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA== @@ -9109,10 +9099,10 @@ syslog-pro@1.0.0: dependencies: moment "^2.22.2" -systeminformation@4.26.10: - version "4.26.10" - resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-4.26.10.tgz#2244e7529ca9e7b8ecd6941e19fe7df7e3da9146" - integrity sha512-bO4FIzrjESAfh4KHwkUJym3jvKtJ4oJ2PG0BBQGBmKa0pF2oanpkB7CF4ZsSX7vfp3+GKaLzioVwpV/3Tyk+lQ== +systeminformation@4.26.12: + version "4.26.12" + resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-4.26.12.tgz#0c6d2c47832b42874dfd5d470d702d7fb5931fa6" + integrity sha512-rO39KsLPxK1UY/s3cgBZz8KUDN7dDgahcgFT2AJaKedo6uKgYHQPdgvhehqNsG+sGBHMUmBwtRUJWgyquEoBHw== syuilo-password-strength@0.0.1: version "0.0.1" @@ -9134,7 +9124,7 @@ tapable@^1.0.0, tapable@^1.0.0-beta.5: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tapable@^2.0.0-beta.10: +tapable@^2.0.0-beta.10, tapable@^2.0.0-beta.11: version "2.0.0-beta.11" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.0.0-beta.11.tgz#5a6bd5e0353fad4da9e94942206bb596639e8cf7" integrity sha512-cAhRzCvMdyJsxmdrSXG8/SUlJG4WJUxD/csuYAybUFjKVt74Y6pTyZ/I1ZK+enmCkWZN0JWxh14G69temaGSiA== @@ -9172,22 +9162,22 @@ tar@^6.0.1, tar@^6.0.2: mkdirp "^1.0.3" yallist "^4.0.0" -terser-webpack-plugin@^3.0.2: - version "3.0.6" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.0.6.tgz#db0a108bbdd3680d72c9b491fbabad09ba207b99" - integrity sha512-z3HLOOPUHkCNGkeEHqqiMAIy1pjpHwS1o+i6Zn0Ws3EAvHJj46737efNNEvJ0Vx9BdDQM83d56qySDJOSORA0A== +terser-webpack-plugin@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.1.0.tgz#6e9d6ae4e1a900d88ddce8da6a47507ea61f44bc" + integrity sha512-0ZWDPIP8BtEDZdChbufcXUigOYk6dOX/P/X0hWxqDDcVAQLb8Yy/0FAaemSfax3PAA67+DJR778oz8qVbmy4hA== dependencies: - cacache "^15.0.4" + cacache "^15.0.5" find-cache-dir "^3.3.1" - jest-worker "^26.0.0" - p-limit "^3.0.1" + jest-worker "^26.3.0" + p-limit "^3.0.2" schema-utils "^2.6.6" serialize-javascript "^4.0.0" source-map "^0.6.1" - terser "^4.8.0" + terser "^5.0.0" webpack-sources "^1.4.3" -terser@>=4, terser@^4.8.0: +terser@>=4: version "4.8.0" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== @@ -9196,6 +9186,15 @@ terser@>=4, terser@^4.8.0: source-map "~0.6.1" source-map-support "~0.5.12" +terser@^5.0.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.2.1.tgz#40b971b8d28b4fe98c9e8c0d073ab48e7bb96cd8" + integrity sha512-/AOtjRtAMNGO0fIF6m8HfcvXTw/2AKpsOzDn36tA5RfhRdeXyb4RvHxJ5Pah7iL6dFkLk+gOnCaNHGwJPl6TrQ== + dependencies: + commander "^2.20.0" + source-map "~0.6.1" + source-map-support "~0.5.12" + text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -9418,10 +9417,10 @@ ts-loader@8.0.2: micromatch "^4.0.0" semver "^6.0.0" -ts-node@8.10.2: - version "8.10.2" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d" - integrity sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA== +ts-node@9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.0.0.tgz#e7699d2a110cc8c0d3b831715e417688683460b3" + integrity sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg== dependencies: arg "^4.1.0" diff "^4.0.1" @@ -9576,10 +9575,10 @@ typeorm@0.2.25: yargonaut "^1.1.2" yargs "^13.2.1" -typescript@3.9.7: - version "3.9.7" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" - integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== +typescript@4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2" + integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ== uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" @@ -9638,13 +9637,6 @@ undertaker@^1.2.1: object.reduce "^1.0.0" undertaker-registry "^1.0.0" -unescape@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/unescape/-/unescape-1.0.1.tgz#956e430f61cad8a4d57d82c518f5e6cc5d0dda96" - integrity sha512-O0+af1Gs50lyH1nUu3ZyYS1cRh01Q/kUKatTOkSs7jukXE6/NebucDVxyiDsA9AQ4JC1V1jUH9EO8JX2nMDgGQ== - dependencies: - extend-shallow "^2.0.1" - union-value@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" @@ -9774,7 +9766,7 @@ uuid@7.0.3: resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== -uuid@8.3.0, uuid@^8.2.0: +uuid@8.3.0, uuid@^8.3.0: version "8.3.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea" integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ== @@ -9951,10 +9943,10 @@ vue-hot-reload-api@^2.3.0: resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== -vue-i18n@8.20.0: - version "8.20.0" - resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.20.0.tgz#c81b01d6541182b28565316cafe881b65a3c0f1b" - integrity sha512-ZiAOoeR4d/JtKpbjipx3I80ey7cYG1ki5gQ7HwzWm4YFio9brA15BEYHjalEoBaEfzF5OBEZP+Y2MvAaWnyXXg== +vue-i18n@8.21.0: + version "8.21.0" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.21.0.tgz#526450525fdbb9c877685b5ba6cb9573b73d3940" + integrity sha512-pKBq6Kg5hNacFHMFgPbpYsFlDIMRu4Ew/tpvTWns14CZoCxt7B3tmSNdrLruGMMivnJu1rhhRqsQqT6YwHkuQQ== vue-json-pretty@1.6.7: version "1.6.7" @@ -9991,19 +9983,15 @@ vue-prism-component@1.2.0: resolved "https://registry.yarnpkg.com/vue-prism-component/-/vue-prism-component-1.2.0.tgz#406252e16979def13b5d28827d95b2b6dc647825" integrity sha512-0N9CNuQu+36CJpdsZHrhdq7d18oBvjVMjawyKdIr8xuzFWLfdxECZQYbFaYoopPBg3SvkEEMtkhYqdgTQl5Y+A== -vue-prism-editor@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/vue-prism-editor/-/vue-prism-editor-0.6.1.tgz#e7c5ed39eecd798d2b4a3a6864985e90ed1f0c00" - integrity sha512-UyFLZ242eAplU0C1Tx/ZHSKFTPODQDMBuW9qqgMJyZqHFL2iuIbfT8EWmKtoNUn8w9VWS9IIicPs2odz2eni4Q== - dependencies: - dom-iterator "^1.0.0" - escape-html "^1.0.3" - unescape "^1.0.1" +vue-prism-editor@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/vue-prism-editor/-/vue-prism-editor-1.2.2.tgz#023cfd4329848f191aac851f2f5e6c7a8c2e059f" + integrity sha512-Lq2VgVygTx3Whn/tC8gD4m1ajA4lzSyCTqPLZA1Dq/ErbBaZA93FWRblwCoDR7AD2nXhGWuiTzb5ih3guzB7DA== -vue-router@3.4.2: - version "3.4.2" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.2.tgz#541221d7ac467786c1c9381bcf36019d883b9cf8" - integrity sha512-n3Ok70hW0EpcJF4lcWIwSHAQbFTnIOLl/fhO8+oTs4jHNtBNsovcVvPZeTOyKEd8C3xF1Crft2ASuOiVT5K1mw== +vue-router@3.4.3: + version "3.4.3" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.3.tgz#fa93768616ee338aa174f160ac965167fa572ffa" + integrity sha512-BADg1mjGWX18Dpmy6bOGzGNnk7B/ZA0RxuA6qedY/YJwirMfKXIDzcccmHbQI0A6k5PzMdMloc0ElHfyOoX35A== vue-style-loader@4.1.2, vue-style-loader@^4.1.0: version "4.1.2" @@ -10023,10 +10011,10 @@ vue-svg-inline-loader-corejs3@1.5.0: loader-utils "^2.0.0" svgo "^1.3.2" -vue-template-compiler@2.6.11: - version "2.6.11" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz#c04704ef8f498b153130018993e56309d4698080" - integrity sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA== +vue-template-compiler@2.6.12: + version "2.6.12" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz#947ed7196744c8a5285ebe1233fe960437fcc57e" + integrity sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg== dependencies: de-indent "^1.0.2" he "^1.1.0" @@ -10036,22 +10024,27 @@ vue-template-es2015-compiler@^1.9.0: resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== -vue@2.6.11, vue@^2.5.13, vue@^2.5.17: +vue@2.6.12: + version "2.6.12" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123" + integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg== + +vue@^2.5.13, vue@^2.5.17: version "2.6.11" resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5" integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ== -vuedraggable@2.24.0: - version "2.24.0" - resolved "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-2.24.0.tgz#1ee069eeb91f61fcb540faf20f1c6b2d4d990a26" - integrity sha512-IlslPpc+iZ2zPNSJbydFZIDrE+don5u+Nc/bjT2YaF+Azidc+wxxJKfKT0NwE68AKk0syb0YbZneAcnynqREZQ== +vuedraggable@2.24.1: + version "2.24.1" + resolved "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-2.24.1.tgz#304abd7644dde05c1f199a227bf9e9107f56197a" + integrity sha512-G1fxO1oshx+WLdieSGl6jSJdlHOQFga1FpjuUpgXldbpKNzxpjsGn4xYNnRHVrOAqm8aG5FfpdQlh5LHesxCeA== dependencies: sortablejs "^1.10.1" -vuex-persistedstate@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/vuex-persistedstate/-/vuex-persistedstate-3.0.1.tgz#6eacc3c416fe8cfe63c40d3ee7b8ed13aac4f04f" - integrity sha512-2dH77+fIecAXO8GeJEXiYnC++gx48PFGUayB5d7rWrN3fblRCOHQoVnmu/VV9DXbHHJcJth/0W/ofl8vw12j1A== +vuex-persistedstate@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/vuex-persistedstate/-/vuex-persistedstate-3.1.0.tgz#a710d01000bff8336bc3b03fa3ef42e376094b71" + integrity sha512-nRiCe1qDdDrcveFQzTw0QGEj3dRpwN19BailSSwfhe4eUNNQ+9S/ApKnDEAuyw95cigOtSPciMEhdsC0qNUiKQ== dependencies: deepmerge "^4.2.2" shvl "^2.0.0" @@ -10122,13 +10115,13 @@ webpack-cli@3.3.12: v8-compile-cache "^2.1.1" yargs "^13.3.2" -webpack-sources@2.0.0-beta.8: - version "2.0.0-beta.8" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.0.0-beta.8.tgz#0fc292239f6767cf4e9b47becfaa340ce6d7ea4f" - integrity sha512-RUaCJu7HYNeuzlY4WYcArcnOzMIj7kHndQ4pBdgP3iiMpG3Ke0BWY5wvb/VEFgsIXp3ZzPGRECwX+4fgpcKFYw== +webpack-sources@2.0.0-beta.9: + version "2.0.0-beta.9" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.0.0-beta.9.tgz#49a504a08c0a8b1c5418c1fdca4ced06b5cb9119" + integrity sha512-q6O+gKGojLye0Fm05vgthtmx5LPbYpAU4FsdMsX8YBgkOZovDbQmBMhjY/CiWhxD9u/0AWeWdXFNbQz17mkdLw== dependencies: source-list-map "^2.0.1" - source-map "~0.6.1" + source-map "^0.6.1" webpack-sources@^1.0.1, webpack-sources@^1.4.3: version "1.4.3" @@ -10138,9 +10131,10 @@ webpack-sources@^1.0.1, webpack-sources@^1.4.3: source-list-map "^2.0.0" source-map "~0.6.1" -"webpack@git+https://github.com/webpack/webpack.git#c1237eae912817c7546e8c54489f7adb60bfbe38": - version "5.0.0-beta.24" - resolved "git+https://github.com/webpack/webpack.git#c1237eae912817c7546e8c54489f7adb60bfbe38" +webpack@5.0.0-beta.28: + version "5.0.0-beta.28" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.0.0-beta.28.tgz#5e3f3f0e1587f3eeffd8402ce7bd3d7d3ab1f242" + integrity sha512-NVaE2s4YlhP07eFtfw8mmBKlRQYcc+vjLIVyLSaawCvJdt7i53oHDe2K8zTDNCNcP/HWluEg9kghV19LBE2T4A== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.45" @@ -10148,23 +10142,24 @@ webpack-sources@^1.0.1, webpack-sources@^1.4.3: "@webassemblyjs/helper-module-context" "1.9.0" "@webassemblyjs/wasm-edit" "1.9.0" "@webassemblyjs/wasm-parser" "1.9.0" - acorn "^7.3.0" + acorn "^7.4.0" chrome-trace-event "^1.0.2" + core-js "^3.6.5" enhanced-resolve "5.0.0-beta.10" - eslint-scope "^5.0.0" - events "^3.0.0" + eslint-scope "^5.1.0" + events "^3.2.0" glob-to-regexp "^0.4.1" - graceful-fs "^4.1.15" + graceful-fs "^4.2.4" json-parse-better-errors "^1.0.2" loader-runner "^4.0.0" - mime-types "^2.1.26" - neo-async "^2.6.1" + mime-types "^2.1.27" + neo-async "^2.6.2" pkg-dir "^4.2.0" - schema-utils "^2.5.0" - tapable "^2.0.0-beta.10" - terser-webpack-plugin "^3.0.2" + schema-utils "^2.7.0" + tapable "^2.0.0-beta.11" + terser-webpack-plugin "^4.1.0" watchpack "2.0.0-beta.14" - webpack-sources "2.0.0-beta.8" + webpack-sources "2.0.0-beta.9" websocket@1.0.31: version "1.0.31" From cd0f8a4ef9eb48a615dc35e258dc68ace82091ff Mon Sep 17 00:00:00 2001 From: Xeltica <7106976+Xeltica@users.noreply.github.com> Date: Sat, 22 Aug 2020 10:06:17 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E3=82=92=E7=A8=AE=E5=88=A5=E3=81=94=E3=81=A8?= =?UTF-8?q?=E3=81=AB=E8=A8=AD=E5=AE=9A=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=20(#6647)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ストリーミング以外は一通り実装 * ストリーミング分も適用 * 通知のグローバル設定をサーバーサイドに保存 * グローバル通知を使うようにしたら更新されなくなるのを修正 * サーバーサイド処理 * i/notifications のパラメーター includeTypes に空配列を渡すと全部の通知が来る問題を修正 * 全て有効/無効ボタンを実装 * Squashed commit of the following: commit c3c111529e7aab640c37679ac3478918bd4781eb Author: syuilo Date: Wed Aug 19 22:29:04 2020 +0900 12.47.0 commit 2dbab66cfe2d4a100a61b25770f65582d9a913ef Author: syuilo Date: Wed Aug 19 22:24:39 2020 +0900 New Crowdin updates (#6617) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Arabic) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Arabic) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (German) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Japanese, Kansai) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Arabic) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Chinese Simplified) commit 01238d6b1a5ba37a08c278a10d4a91a27839cbe3 Author: Acid Chicken (硫酸鶏) Date: Wed Aug 19 22:24:02 2020 +0900 Update README.md [AUTOGEN] (#6593) commit c34f302b1c91bd3b091cd03fa60fae86b385f902 Author: syuilo Date: Wed Aug 19 21:47:18 2020 +0900 enhance(client): サーバーから切断されたときにダイアログで警告を表示できるように commit 6870262f8d50407115160979b483a43503ee854f Author: syuilo Date: Wed Aug 19 17:52:11 2020 +0900 enhance(client): Better element visible detection commit c54d5e70401d8a417f1fe816fc354c9851a23d20 Author: syuilo Date: Wed Aug 19 17:51:31 2020 +0900 fix(clinet): 誤字によりスクロールイベントリスナが解除されていなかったのを修正 commit 0ace009a54f6b781def9386298a2b053f3224bc6 Author: syuilo Date: Tue Aug 18 22:52:54 2020 +0900 fix(server): Prevent error when recieve non-json data from websocket Fix #6658 commit 48e8ee440bcff712710666861262b0a6492a3794 Author: MeiMei <30769358+mei23@users.noreply.github.com> Date: Tue Aug 18 22:48:52 2020 +0900 WebPのアニメーションが失われるのを修正 Fix #6625 (#6649) commit 9855405b8989713b81709fc1700e2ead97423467 Author: syuilo Date: Tue Aug 18 22:44:21 2020 +0900 Channel (#6621) * wip * wip * wip * wip * wip * wip * wip * wip * wop * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * add notes * wip * wip * wip * wip * sound * wip * add kick_gaba2 * wip commit 122076e8eaa5517ee3fab6caacd0d12e61654125 Author: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sat Aug 15 04:27:19 2020 +0900 Sign (request-target) Fix #6652 (#6656) commit 7c5ac2cbb407fbcdd06f7561ccbcff56c9da6a14 Author: syuilo Date: Fri Aug 14 15:24:55 2020 +0900 perf(server): Add isSensitive index to improve query performance commit ccda2181c1c0a02a3d9feeb47e40644ca043bb11 Author: MeiMei <30769358+mei23@users.noreply.github.com> Date: Fri Aug 14 00:54:33 2020 +0900 GCSに大きいファイルがアップロードできないのを修正 Fix #6254 (#6648) commit b5fe4ba9bef376a5977c23c82f4666458abcecfd Author: syuilo Date: Thu Aug 13 23:02:43 2020 +0900 WIP: Improve admin dashboard commit fd9c7d525a9d57666edd7fc2b717ee2a1b6fa231 Merge: 080574e13 ee0a44559 Author: syuilo Date: Thu Aug 13 21:27:10 2020 +0900 Merge branch 'develop' of https://github.com/syuilo/misskey into develop commit 080574e13d46075e537249d926781a91a490eb38 Author: syuilo Date: Thu Aug 13 21:27:06 2020 +0900 WIP: Improve admin dashboard commit ee0a44559040e83ce7d184bef57372f9c3602a75 Author: MeiMei <30769358+mei23@users.noreply.github.com> Date: Thu Aug 13 20:05:01 2020 +0900 Option objectStorageSetPublicRead (#6645) commit bb342c76016d71fddb9c272c855292bec604fc87 Author: syuilo Date: Thu Aug 13 19:56:46 2020 +0900 WIP: Improve admin dashboard commit ed17636fb9852263b33e37fe9cc6eb20d2aafbc8 Author: syuilo Date: Thu Aug 13 17:58:16 2020 +0900 WIP: Improve admin dashboard commit c59d7d941ad5b241b12e9adb580c35804a86a465 Author: syuilo Date: Wed Aug 12 17:42:12 2020 +0900 Update README.md Close #6644 commit 377377595abb56f10b24db43774da4661b6e9f06 Author: syuilo Date: Mon Aug 10 20:23:51 2020 +0900 enhance(client): Improve admin page commit d63aef9963bf727d35eb868360cced774ae8d733 Author: syuilo Date: Mon Aug 10 13:55:00 2020 +0900 chore(client): Fix style commit e9b28fa3c00c7e1dc98c567d47111b33fbba2bf7 Author: syuilo Date: Mon Aug 10 13:00:10 2020 +0900 chore(client): Design tweaks commit be255dc583dade8c1168e4dd71c9d11ab2ac45e9 Author: syuilo Date: Mon Aug 10 12:42:51 2020 +0900 chore(client): Design tweak commit 18eb7c6087129d15873c0d05740839ccf0a53f17 Author: syuilo Date: Mon Aug 10 12:31:22 2020 +0900 chore(client): Design tweaks commit cf29e69813888c372867a166525a251e1f0d8c60 Author: syuilo Date: Mon Aug 10 12:28:35 2020 +0900 chore(client): Fix bug commit 132da7e3c06bc40b6680bffc299ca354ddac1cd8 Author: syuilo Date: Mon Aug 10 12:20:58 2020 +0900 Update ja-JP.yml commit 26df23bb6463133a516217b89c0a9ec992f4ac3f Author: syuilo Date: Mon Aug 10 12:18:02 2020 +0900 chore(client): fix style commit 76389ad619ff63e3015643c9e32a5ecfd7c34d33 Author: syuilo Date: Mon Aug 10 12:15:58 2020 +0900 chore(client): Design tweaks commit 7cde8cfbf2c840186f4c2025fb34cc108bb84c50 Author: syuilo Date: Mon Aug 10 11:51:43 2020 +0900 chore(client): Design tweaks commit 4eb2ddac4e6d4dead85613f12155865cc053f17f Author: syuilo Date: Mon Aug 10 11:24:30 2020 +0900 chore(client): Design tweaks commit dc51eef27c97798bfa3fed62c0d4013a5efbd3f8 Merge: bff8a23cb 9c5efb9da Author: syuilo Date: Mon Aug 10 10:38:00 2020 +0900 Merge branch 'develop' of https://github.com/syuilo/misskey into develop commit bff8a23cbc2a7046924d44e8da8b23d4207f3edf Author: syuilo Date: Mon Aug 10 10:37:57 2020 +0900 chore(client): Design tweaks commit 9c5efb9da0a166add3edbc8d51156ea260e814a8 Author: rinsuki <428rinsuki+git@gmail.com> Date: Mon Aug 10 01:33:01 2020 +0900 Dockerのビルド時にgitを入れるように (#6639) https://github.com/syuilo/misskey/commit/917d3d0bd3e7746b722f154860c604c4d6c92c69 でgitの依存関係が追加されたのにgitが入っていないのでコケていた commit 48b8320e5ec6971d19b7734e22b0a1518b545f1e Author: rinsuki <428rinsuki+git@gmail.com> Date: Mon Aug 10 01:32:27 2020 +0900 Fix #6637 (#6638) * Fix #6637 * fix lint commit 9b2ed96c1cb0e311fcc51d367dc0411e833b1698 Author: syuilo Date: Sun Aug 9 15:59:38 2020 +0900 chore: Clean up commit 69d9aa71f25ab06d8024b04ce341909425d053d6 Author: syuilo Date: Sun Aug 9 15:51:02 2020 +0900 Full view mode (#6636) * wuip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update folder.vue * wip * Update size.ts * wip * wip * Update index.vue * wip commit 13683780cdfa6c71767127ce75e2755b40c03356 Author: syuilo Date: Sun Aug 9 13:49:44 2020 +0900 :v: commit d780e5b251c8f4f593f7bece72439e411a3c0b66 Author: syuilo Date: Sun Aug 9 13:46:19 2020 +0900 enhance(client): ミュートされたノート数を表示するようにしたり commit 917d3d0bd3e7746b722f154860c604c4d6c92c69 Author: syuilo Date: Sat Aug 8 10:30:38 2020 +0900 chore: Update dependencies :rocket: commit 4b19c53697e3edae1ffd5dff1f78d25837cafe7f Author: syuilo Date: Sat Aug 8 10:27:37 2020 +0900 client: テーマコードをコピーできるようにしたり commit 2d40a15d2bc7356fdd82dd980cce202d6e9acdbc Author: syuilo Date: Fri Aug 7 11:27:37 2020 +0900 refactor: Extract well-known services commit 2bdcd22ad44aed94eb406f788f1546d73fcdf73e Author: syuilo Date: Tue Aug 4 23:09:48 2020 +0900 enhance(api): アクセストークンを作成する際、createdAtをlastUsedAtを揃えるようにして、未使用かどうかを判定できるように commit f73a4e1304317fcfb06aedd5ad4890d03d704d73 Author: MeiMei <30769358+mei23@users.noreply.github.com> Date: Tue Aug 4 21:12:55 2020 +0900 Update .dockerignore (#6620) commit b265cdbd8453edb65a5aab739bc4d3dfd3ce075d Author: Xeltica <7106976+Xeltica@users.noreply.github.com> Date: Mon Aug 3 13:40:32 2020 +0900 Update CHANGELOG.md commit a04d8b95c24ec3935fa4ac3d6df9d714d5758e93 Author: Xeltica <7106976+Xeltica@users.noreply.github.com> Date: Mon Aug 3 13:40:13 2020 +0900 Update CHANGELOG.md commit 0e9a8c0cd48361cb07b78740fd2b1eeddbc6cd55 Author: syuilo Date: Sun Aug 2 13:59:05 2020 +0900 fix(client): Message read state is not reactive commit 5ae8a3c7e8531154d0dd870aaeb92c4c0c14e15d Author: syuilo Date: Sun Aug 2 13:49:28 2020 +0900 refactor * fix: includeTypes 未指定時に通知が返ってこなくなるバグを修正 * 最適化とバグ修正 * 挙動を修正 * Update ja-JP.yml * 不要なimportを削除 * ✌ * 不要なコードの削除 * Update notification-setting-window.vue * Update notification-setting-window.vue * :art: Co-authored-by: syuilo --- locales/ja-JP.yml | 11 ++- ...597236229720-IncludingNotificationTypes.ts | 16 +++ src/client/app.vue | 4 + .../components/deck/notifications-column.vue | 28 ++---- .../notification-setting-window.vue | 98 +++++++++++++++++++ src/client/components/notifications.vue | 39 +++++--- src/client/deck.vue | 6 +- src/client/pages/my-settings/index.vue | 21 ++++ src/client/scripts/form.ts | 5 + src/client/widgets/notifications.vue | 23 ++++- src/models/entities/user-profile.ts | 8 ++ src/models/repositories/user.ts | 1 + src/server/api/endpoints/i/notifications.ts | 14 ++- src/server/api/endpoints/i/update.ts | 6 ++ src/services/create-notification.ts | 9 +- 15 files changed, 245 insertions(+), 44 deletions(-) create mode 100644 migration/1597236229720-IncludingNotificationTypes.ts create mode 100644 src/client/components/notification-setting-window.vue diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 870041d673..0812bd8e5b 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -566,6 +566,10 @@ delayed: "遅延" database: "データベース" channel: "チャンネル" create: "作成" +notificationSetting: "通知設定" +notificationSettingDesc: "表示する通知の種別を選択してください。" +useGlobalSetting: "グローバル設定を使う" +useGlobalSettingDesc: "オンにすると、アカウントの通知設定が使用されます。オフにすると、個別に設定できるようになります。" _serverDisconnectedBehavior: reload: "自動でリロード" @@ -1285,8 +1289,11 @@ _notification: renote: "Renote" quote: "引用" reaction: "リアクション" - pollVote: "投票" - receiveFollowRequest: "フォローリクエスト" + pollVote: "アンケートに投票された" + receiveFollowRequest: "フォロー申請を受け取った" + followRequestAccepted: "フォローが受理された" + groupInvited: "グループに招待された" + app: "連携アプリからの通知" _deck: alwaysShowMainColumn: "常にメインカラムを表示" diff --git a/migration/1597236229720-IncludingNotificationTypes.ts b/migration/1597236229720-IncludingNotificationTypes.ts new file mode 100644 index 0000000000..be57824c0b --- /dev/null +++ b/migration/1597236229720-IncludingNotificationTypes.ts @@ -0,0 +1,16 @@ +import {MigrationInterface, QueryRunner} from "typeorm"; + +export class IncludingNotificationTypes1597236229720 implements MigrationInterface { + name = 'IncludingNotificationTypes1597236229720' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`CREATE TYPE "user_profile_includingnotificationtypes_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`); + await queryRunner.query(`ALTER TABLE "user_profile" ADD "includingNotificationTypes" "user_profile_includingnotificationtypes_enum" array`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "includingNotificationTypes"`); + await queryRunner.query(`DROP TYPE "user_profile_includingnotificationtypes_enum"`); + } + +} diff --git a/src/client/app.vue b/src/client/app.vue index f81e7e44ad..c10ba9c9d9 100644 --- a/src/client/app.vue +++ b/src/client/app.vue @@ -328,6 +328,10 @@ export default Vue.extend({ }, async onNotification(notification) { + const t = this.$store.state.i.includingNotificationTypes; + if (!!t && !t.includes(notification.type)) { + return; + } if (document.visibilityState === 'visible') { this.$root.stream.send('readNotification', { id: notification.id diff --git a/src/client/components/deck/notifications-column.vue b/src/client/components/deck/notifications-column.vue index 331cb9207f..ac49aec06d 100644 --- a/src/client/components/deck/notifications-column.vue +++ b/src/client/components/deck/notifications-column.vue @@ -2,7 +2,7 @@ - + @@ -38,28 +38,14 @@ export default Vue.extend({ }, created() { - if (this.column.notificationType == null) { - this.column.notificationType = 'all'; - this.$store.commit('deviceUser/updateDeckColumn', this.column); - } - this.menu = [{ icon: faCog, - text: this.$t('notificationType'), - action: () => { - this.$root.dialog({ - title: this.$t('notificationType'), - type: null, - select: { - items: ['all', 'follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest'].map(x => ({ - value: x, text: this.$t(`_notification._types.${x}`) - })) - default: this.column.notificationType, - }, - showCancelButton: true - }).then(({ canceled, result: type }) => { - if (canceled) return; - this.column.notificationType = type; + text: this.$t('notificationSetting'), + action: async () => { + this.$root.new(await import('../notification-setting-window.vue').then(m => m.default), { + includingTypes: this.column.includingTypes, + }).$on('ok', async ({ includingTypes }) => { + this.$set(this.column, 'includingTypes', includingTypes); this.$store.commit('deviceUser/updateDeckColumn', this.column); }); } diff --git a/src/client/components/notification-setting-window.vue b/src/client/components/notification-setting-window.vue new file mode 100644 index 0000000000..d63a3d48a5 --- /dev/null +++ b/src/client/components/notification-setting-window.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/src/client/components/notifications.vue b/src/client/components/notifications.vue index 1271b89475..07dee6354b 100644 --- a/src/client/components/notifications.vue +++ b/src/client/components/notifications.vue @@ -17,11 +17,12 @@ diff --git a/src/client/scripts/form.ts b/src/client/scripts/form.ts index 3cf062be2a..7bf6cec452 100644 --- a/src/client/scripts/form.ts +++ b/src/client/scripts/form.ts @@ -21,6 +21,11 @@ export type FormItem = { default: string | null; hidden?: boolean; enum: string[]; +} | { + label?: string; + type: 'array'; + default: unknown[] | null; + hidden?: boolean; }; export type Form = Record; diff --git a/src/client/widgets/notifications.vue b/src/client/widgets/notifications.vue index 24d7fe4200..9d6282735b 100644 --- a/src/client/widgets/notifications.vue +++ b/src/client/widgets/notifications.vue @@ -1,15 +1,16 @@ diff --git a/src/models/entities/user-profile.ts b/src/models/entities/user-profile.ts index cf1c341182..0eeed1b40e 100644 --- a/src/models/entities/user-profile.ts +++ b/src/models/entities/user-profile.ts @@ -2,6 +2,7 @@ import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'type import { id } from '../id'; import { User } from './user'; import { Page } from './page'; +import { notificationTypes } from '../../types'; @Entity() export class UserProfile { @@ -158,6 +159,13 @@ export class UserProfile { }) public mutedWords: string[][]; + @Column('enum', { + enum: notificationTypes, + array: true, + nullable: true, + }) + public includingNotificationTypes: typeof notificationTypes[number][] | null; + //#region Denormalized fields @Index() @Column('varchar', { diff --git a/src/models/repositories/user.ts b/src/models/repositories/user.ts index ae5321b15a..b1b084b740 100644 --- a/src/models/repositories/user.ts +++ b/src/models/repositories/user.ts @@ -248,6 +248,7 @@ export class UserRepository extends Repository { hasPendingReceivedFollowRequest: this.getHasPendingReceivedFollowRequest(user.id), integrations: profile!.integrations, mutedWords: profile!.mutedWords, + includingNotificationTypes: profile?.includingNotificationTypes, } : {}), ...(opts.includeSecrets ? { diff --git a/src/server/api/endpoints/i/notifications.ts b/src/server/api/endpoints/i/notifications.ts index db6772beb3..fd355dab83 100644 --- a/src/server/api/endpoints/i/notifications.ts +++ b/src/server/api/endpoints/i/notifications.ts @@ -44,12 +44,10 @@ export const meta = { includeTypes: { validator: $.optional.arr($.str.or(notificationTypes as unknown as string[])), - default: [] as string[] }, excludeTypes: { validator: $.optional.arr($.str.or(notificationTypes as unknown as string[])), - default: [] as string[] } }, @@ -65,6 +63,14 @@ export const meta = { }; export default define(meta, async (ps, user) => { + // includeTypes が空の場合はクエリしない + if (ps.includeTypes && ps.includeTypes.length === 0) { + return []; + } + // excludeTypes に全指定されている場合はクエリしない + if (notificationTypes.every(type => ps.excludeTypes?.includes(type))) { + return []; + } const followingQuery = Followings.createQueryBuilder('following') .select('following.followeeId') .where('following.followerId = :followerId', { followerId: user.id }); @@ -91,9 +97,9 @@ export default define(meta, async (ps, user) => { query.setParameters(followingQuery.getParameters()); } - if (ps.includeTypes!.length > 0) { + if (ps.includeTypes?.length > 0) { query.andWhere(`notification.type IN (:...includeTypes)`, { includeTypes: ps.includeTypes }); - } else if (ps.excludeTypes!.length > 0) { + } else if (ps.excludeTypes?.length > 0) { query.andWhere(`notification.type NOT IN (:...excludeTypes)`, { excludeTypes: ps.excludeTypes }); } diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index e1889df22d..327e303a66 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -14,6 +14,7 @@ import { Users, DriveFiles, UserProfiles, Pages } from '../../../../models'; import { User } from '../../../../models/entities/user'; import { UserProfile } from '../../../../models/entities/user-profile'; import { ensure } from '../../../../prelude/ensure'; +import { notificationTypes } from '../../../../types'; export const meta = { desc: { @@ -147,6 +148,10 @@ export const meta = { mutedWords: { validator: $.optional.arr($.arr($.str)) }, + + includingNotificationTypes: { + validator: $.optional.arr($.str.or(notificationTypes as unknown as string[])) + }, }, errors: { @@ -201,6 +206,7 @@ export default define(meta, async (ps, user, token) => { profileUpdates.mutedWords = ps.mutedWords; profileUpdates.enableWordMute = ps.mutedWords.length > 0; } + if (ps.includingNotificationTypes !== undefined) profileUpdates.includingNotificationTypes = ps.includingNotificationTypes as typeof notificationTypes[number][]; if (typeof ps.isLocked === 'boolean') updates.isLocked = ps.isLocked; if (typeof ps.isBot === 'boolean') updates.isBot = ps.isBot; if (typeof ps.carefulBot === 'boolean') profileUpdates.carefulBot = ps.carefulBot; diff --git a/src/services/create-notification.ts b/src/services/create-notification.ts index 7fc8bfaf53..4e713e3804 100644 --- a/src/services/create-notification.ts +++ b/src/services/create-notification.ts @@ -1,6 +1,6 @@ import { publishMainStream } from './stream'; import pushSw from './push-notification'; -import { Notifications, Mutings } from '../models'; +import { Notifications, Mutings, UserProfiles } from '../models'; import { genId } from '../misc/gen-id'; import { User } from '../models/entities/user'; import { Notification } from '../models/entities/notification'; @@ -14,13 +14,18 @@ export async function createNotification( return null; } + const profile = await UserProfiles.findOne({ userId: notifieeId }); + + const isMuted = !profile?.includingNotificationTypes?.includes(type); + // Create notification const notification = await Notifications.save({ id: genId(), createdAt: new Date(), notifieeId: notifieeId, type: type, - isRead: false, + // 相手がこの通知をミュートしているようなら、既読を予めつけておく + isRead: isMuted, ...data } as Partial); From d5e1e523b6df67c6fd6841848b71d891f728984a Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 22 Aug 2020 10:11:14 +0900 Subject: [PATCH 3/5] New Crowdin updates (#6661) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Korean) --- locales/es-ES.yml | 19 +++++++++++++++++++ locales/ko-KR.yml | 9 +++++++++ locales/zh-CN.yml | 14 ++++++++------ 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/locales/es-ES.yml b/locales/es-ES.yml index a42ae9e9a4..9400309a2a 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -264,6 +264,7 @@ rename: "Renombrar" avatar: "Avatar" banner: "Banner" nsfw: "Marcado como sensible" +whenServerDisconnected: "Cuando se pierda la conexión con el servidor" disconnectedFromServer: "Desconectado del servidor" reload: "Recargar" doNothing: "No hacer nada" @@ -563,8 +564,22 @@ overview: "Resumen" logs: "Registros" delayed: "atrasado" database: "Base de datos" +channel: "Canal" +create: "Crear" +_serverDisconnectedBehavior: + reload: "Recargar automáticamente" + dialog: "Mostrar diálogo de advertencia" + quiet: "Advertencia discreta" _channel: + create: "Crear canal" + edit: "Editar canal" + setBanner: "Elegir banner" + removeBanner: "Borrar banner" featured: "Tendencias" + owned: "Dueño" + following: "Siguiendo" + usersCount: "{n} participantes" + notesCount: "{n} notas" _sidebar: full: "Completo" icon: "Avatar" @@ -656,6 +671,7 @@ _sfx: chat: "Chat" chatBg: "Chat (Fondo)" antenna: "Antena receptora" + channel: "Notificaciones del canal" _ago: unknown: "Desconocido" future: "Futuro" @@ -731,6 +747,8 @@ _permissions: "write:page-likes": "Administrar páginas que te gustan" "read:user-groups": "Ver grupos de usuarios" "write:user-groups": "Administrar grupos de usuarios" + "read:channels": "Ver canal" + "write:channels": "Modificar canal" _auth: shareAccess: "¿Desea permitir el acceso a la cuenta \"{name}\"?" shareAccessAsk: "¿Está seguro de que desea autorizar esta aplicación para acceder a su cuenta?" @@ -805,6 +823,7 @@ _visibility: _postForm: replyPlaceholder: "Responder a esta nota" quotePlaceholder: "Citar esta nota" + channelPlaceholder: "Postear en el canal" _placeholders: a: "¿Qué haces?" b: "¿Te pasó algo?" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 0dcea81574..21abac854f 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -551,13 +551,21 @@ makeActive: "활성화" copy: "복사" logs: "로그" database: "데이터베이스" +channel: "채널" _channel: + create: "채널 생성" + setBanner: "배너 설정" + removeBanner: "배너 삭제" featured: "트렌드" + following: "팔로잉" + usersCount: "{n}명 참여 중" + notesCount: "{n}노트" _sidebar: icon: "아바타" hide: "숨기기" _wordMute: muteWords: "뮤트할 단어" + mutedNotes: "뮤트된 노트" _theme: explore: "테마 찾아보기" install: "테마 설치" @@ -578,6 +586,7 @@ _theme: func: "함수" funcKind: "함수 종류" argument: "매개변수" + importInfo: "여기에 테마 코드를 붙여 넣어 에디터로 불러올 수 있습니다." keys: link: "링크" hashtag: "해시태그" diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index 9054d150c1..230b41bbd9 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -359,7 +359,7 @@ moderator: "版主" nUsersMentioned: "{n} 被提到" securityKey: "安全密钥" securityKeyName: "密钥名称" -registerSecurityKey: "注册安全密钥" +registerSecurityKey: "注册硬件安全密钥" lastUsed: "最后使用：" unregister: "删除账户" passwordLessLogin: "无密码登录" @@ -455,13 +455,13 @@ showFeaturedNotesInTimeline: "在时间线上显示热门推荐" objectStorage: "对象存储" useObjectStorage: "使用对象存储" objectStorageBaseUrl: "基本网址" -objectStorageBaseUrlDesc: "供参考的URL。如果使用CDN或Proxy，则其URL为S3：\"https://.s3.amazonaws.com\"、GCS等：\"https://storage-googleapis.proxy.ustclug.org/\"。" +objectStorageBaseUrlDesc: "URL前缀，用于构造URL到对象（媒体）的引用，如果您使用的是CDN或反向代理，请指定其URL，否则请根据您使用的服务指定可公开访问的地址。例如“https://.s3.amazonaws.com”用于AWS S3，“https://storage.googleapis.com/”用于GCS" objectStorageBucket: "存储桶" objectStorageBucketDesc: "请指定使用的对象存储服务的存储桶名称。" objectStoragePrefix: "前缀" objectStoragePrefixDesc: "文件将存储在此前缀的目录下。" objectStorageEndpoint: "端点" -objectStorageEndpointDesc: "S3默认情况下为空，否则请为每个服务指定端点。 指定为“”或“:”。" +objectStorageEndpointDesc: "如果你希望使用AWS S3请留空。否则请根据你使用的服务来进行设置，指定端点形式为“”或“:”。" objectStorageRegion: "可用区" objectStorageRegionDesc: "指定一个可用区，例如“xx-east-1”。 如果您的对象存储服务没有可用区概念，请将其留空或填写“us-east-1”。" objectStorageUseSSL: "使用SSL" @@ -568,6 +568,8 @@ channel: "频道" create: "创建" _serverDisconnectedBehavior: reload: "自动重载" + dialog: "对话框警告" + quiet: "安静警告" _channel: create: "创建频道" edit: "编辑频道" @@ -650,7 +652,7 @@ _theme: cwFg: "CW 按钮文本" cwHoverBg: "CW 按钮背景（悬停）" toastBg: "吐司提示背景" - toastFg: "土司提示文本" + toastFg: "吐司提示文本" buttonBg: "按钮背景" buttonHoverBg: "按钮背景（悬停）" inputBorder: "输入框边框" @@ -706,7 +708,7 @@ _tutorial: step6_1: "现在，您将可以在时间线上看到其他用户的帖子。" step6_2: "您还可以在其他人的帖子上进行「回应」，以快速做出简单回复。" step6_3: "在他人的贴子上按下「+」图标，即可选择想要的表情来进行「回应」。" - step7_1: "对Misskey基本操作的简单介绍，到此结束了。 辛苦了！" + step7_1: "对Misskey基本操作的简单介绍，就到此结束了。 辛苦了！" step7_2: "如果你想了解更多有关Misskey的信息，请参见{help}。" step7_3: "接下来，享受Misskey带来的乐趣吧🚀" _2fa: @@ -717,7 +719,7 @@ _2fa: step2: "然后，扫描屏幕上显示的二维码。" step3: "输入您的应用提供的动态口令以完成设置。" step4: "从现在开始，任何登录操作都将要求您提供动态口令。" - securityKeyInfo: "您可以设置使用支持FIDO2的硬件安全密钥、指纹或设备上的PIN来保护您的登录过程。" + securityKeyInfo: "您可以设置使用支持FIDO2的硬件安全密钥、设备上的指纹或PIN来保护您的登录过程。" _permissions: "read:account": "查看账户信息" "write:account": "更改帐户信息" From 95db488c48caa3f16b87ea3785a36379909f131d Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 22 Aug 2020 10:11:46 +0900 Subject: [PATCH 4/5] 12.47.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2f46cec1dc..d04fdf6026 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "12.47.0", + "version": "12.47.1", "codename": "indigo", "repository": { "type": "git", From ed141338fb804ffc1ba284a75065b6a73023e03b Mon Sep 17 00:00:00 2001 From: Xeltica <7106976+Xeltica@users.noreply.github.com> Date: Sun, 23 Aug 2020 11:05:04 +0900 Subject: [PATCH 5/5] =?UTF-8?q?Safari=20=E3=81=A7=20mk-select=20=E3=81=AB?= =?UTF-8?q?=E5=85=89=E6=B2=A2=E3=81=8C=E3=81=8B=E3=81=8B=E3=82=8B=E3=81=AE?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20(#6668)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/components/ui/select.vue | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/client/components/ui/select.vue b/src/client/components/ui/select.vue index d42560e13a..cb737df6ed 100644 --- a/src/client/components/ui/select.vue +++ b/src/client/components/ui/select.vue @@ -13,7 +13,11 @@ > -
+
+ + + +
@@ -21,6 +25,7 @@