From f9462ad5ae899b7935aec16adb3733cebeddb785 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Jun 2021 20:05:18 +0000 Subject: [PATCH 1/8] Bump vue from 2.6.12 to 2.6.14 in /app Bumps [vue](https://github.com/vuejs/vue) from 2.6.12 to 2.6.14. - [Release notes](https://github.com/vuejs/vue/releases) - [Commits](https://github.com/vuejs/vue/compare/v2.6.12...v2.6.14) --- updated-dependencies: - dependency-name: vue dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/package.json | 2 +- app/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/package.json b/app/package.json index 74f6d088..eca2d046 100644 --- a/app/package.json +++ b/app/package.json @@ -72,7 +72,7 @@ "sweetalert2": "^11.0.12", "system-font-families": "^0.4.1", "textarea-caret": "^3.1.0", - "vue": "^2.6.12" + "vue": "^2.6.14" }, "devDependencies": { "browserify": "^17.0.0", diff --git a/app/yarn.lock b/app/yarn.lock index f6b22c7e..20577417 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -5267,10 +5267,10 @@ vm-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -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.6.14: + version "2.6.14" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235" + integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ== wcwidth@^1.0.1: version "1.0.1" From ffcbe71ecb1c8bf90278e71df8bbf104f6d5aa5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Jun 2021 20:02:54 +0000 Subject: [PATCH 2/8] Bump electron from 13.0.1 to 13.1.2 in /app Bumps [electron](https://github.com/electron/electron) from 13.0.1 to 13.1.2. - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md) - [Commits](https://github.com/electron/electron/compare/v13.0.1...v13.1.2) --- updated-dependencies: - dependency-name: electron dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/package.json | 2 +- app/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/package.json b/app/package.json index 74f6d088..eb51478d 100644 --- a/app/package.json +++ b/app/package.json @@ -78,7 +78,7 @@ "browserify": "^17.0.0", "chokidar": "^3.5.1", "dotenv": "^9.0.2", - "electron": "^13.0.1", + "electron": "^13.1.2", "electron-builder": "^22.11.5", "electron-notarize": "^1.0.0", "electron-rebuild": "^2.3.5", diff --git a/app/yarn.lock b/app/yarn.lock index f6b22c7e..eb86d9b6 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -1878,10 +1878,10 @@ electron-rebuild@^2.3.5: tar "^6.0.5" yargs "^16.0.0" -electron@^13.0.1: - version "13.0.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-13.0.1.tgz#7dd3666f0f966ab83a1f9868d84add2e6205d43a" - integrity sha512-ds1cf0m46nStil0jbM2r9W/p+Kprdq22+2MikIUqEu69eGl1c86IinQVrpmJ9bR4RshDSF4j3uD32a0bsHDMnQ== +electron@^13.1.2: + version "13.1.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.2.tgz#8c9abf9015766c9cbc16f10c99282d00d6ae1b90" + integrity sha512-aNT9t+LgdQaZ7FgN36pN7MjSEoj+EWc2T9yuOqBApbmR4HavGRadSz7u9N2Erw2ojdIXtei2RVIAvVm8mbDZ0g== dependencies: "@electron/get" "^1.0.1" "@types/node" "^14.6.2" From a64813d2d90854445e2e712738057421582f3662 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Jun 2021 10:31:59 +0000 Subject: [PATCH 3/8] Bump normalize-url from 4.5.0 to 4.5.1 in /app Bumps [normalize-url](https://github.com/sindresorhus/normalize-url) from 4.5.0 to 4.5.1. - [Release notes](https://github.com/sindresorhus/normalize-url/releases) - [Commits](https://github.com/sindresorhus/normalize-url/commits) --- updated-dependencies: - dependency-name: normalize-url dependency-type: indirect ... Signed-off-by: dependabot[bot] --- app/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/yarn.lock b/app/yarn.lock index f6b22c7e..f4af6308 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -3654,9 +3654,9 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== normalize-url@^4.1.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" - integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== + version "4.5.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== npm-bundled@^1.0.1: version "1.1.1" From aa377b78e0fa26a17fd41ee363ccdd804a8ede48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Jun 2021 20:03:24 +0000 Subject: [PATCH 4/8] Bump electron-builder from 22.11.5 to 22.11.7 in /app Bumps [electron-builder](https://github.com/electron-userland/electron-builder) from 22.11.5 to 22.11.7. - [Release notes](https://github.com/electron-userland/electron-builder/releases) - [Changelog](https://github.com/electron-userland/electron-builder/blob/master/CHANGELOG.md) - [Commits](https://github.com/electron-userland/electron-builder/compare/v22.11.5...v22.11.7) --- updated-dependencies: - dependency-name: electron-builder dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/package.json | 2 +- app/yarn.lock | 82 ++++++++++++++++++++++++++---------------------- 2 files changed, 46 insertions(+), 38 deletions(-) diff --git a/app/package.json b/app/package.json index 74f6d088..3001f726 100644 --- a/app/package.json +++ b/app/package.json @@ -79,7 +79,7 @@ "chokidar": "^3.5.1", "dotenv": "^9.0.2", "electron": "^13.0.1", - "electron-builder": "^22.11.5", + "electron-builder": "^22.11.7", "electron-notarize": "^1.0.0", "electron-rebuild": "^2.3.5", "eslint": "^7.27.0", diff --git a/app/yarn.lock b/app/yarn.lock index f6b22c7e..16190fb2 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -513,10 +513,10 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== -"@types/yargs@^16.0.1": - version "16.0.2" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.2.tgz#b860dfa2964425239bba37ab3178b0acd79b8a61" - integrity sha512-EkZDJvHXblOE2/iFZb3Ty5c8RHPssmFvrXqj3V/ZLXtOt0f7xJh9Fd7p1pl2ITrNHM7Rl3Db3JJVBT7q/C0wUg== +"@types/yargs@^16.0.2": + version "16.0.3" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.3.tgz#4b6d35bb8e680510a7dc2308518a80ee1ef27e01" + integrity sha512-YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ== dependencies: "@types/yargs-parser" "*" @@ -652,10 +652,10 @@ app-builder-bin@3.5.13: resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz#6dd7f4de34a4e408806f99b8c7d6ef1601305b7e" integrity sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg== -app-builder-lib@22.11.5: - version "22.11.5" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.5.tgz#d49f49dc2d9fd225249e4ae7e30add2996e7062f" - integrity sha512-lLEDvJuLdc4IVyADJK6t4qEIjRhOUj4p19B1RS/8pN/oAb8X5Qe1t3Einbsi4oFBJBweH2LIygnSAwumjQh9iA== +app-builder-lib@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.7.tgz#c0ad1119ebfbf4189a8280ad693625f5e684dca6" + integrity sha512-pS9/cR4/TnNZVAHZECiSvvwTBzbwblj7KBBZkMKDG57nibq0I1XY8zAaYeHFdlYTyrRcz9JUXbAqJKezya7UFQ== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" @@ -663,12 +663,12 @@ app-builder-lib@22.11.5: "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.11.5" - builder-util-runtime "8.7.6" + builder-util "22.11.7" + builder-util-runtime "8.7.7" chromium-pickle-js "^0.2.0" debug "^4.3.2" ejs "^3.1.6" - electron-publish "22.11.5" + electron-publish "22.11.7" fs-extra "^10.0.0" hosted-git-info "^4.0.2" is-ci "^3.0.0" @@ -1096,17 +1096,25 @@ builder-util-runtime@8.7.6: debug "^4.3.2" sax "^1.2.4" -builder-util@22.11.5: - version "22.11.5" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.5.tgz#08836d00e6bef39bdffd8a66fb07d2d5021b9c3c" - integrity sha512-ur9ksncYOnJg/VuJz3PdsBQHeg9tjdOC2HVj8mQ0WNcn/H3MO4tnwKBOWWikPDiWEjeBSvFUmYBnGFkRiUNkww== +builder-util-runtime@8.7.7: + version "8.7.7" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz#6c83cc3abe7a7a5c8b4ec8878f68adc828c07f0d" + integrity sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow== + dependencies: + debug "^4.3.2" + sax "^1.2.4" + +builder-util@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.7.tgz#ae9707afa6a31feafa13c274ac83b4fe28ef1467" + integrity sha512-ihqUe5ey82LM9qqQe0/oIcaSm9w+B9UjcsWJZxJliTBsbU+sErOpDFpHW+sim0veiTF/EIcGUh9HoduWw+l9FA== dependencies: "7zip-bin" "~5.1.1" "@types/debug" "^4.1.5" "@types/fs-extra" "^9.0.11" app-builder-bin "3.5.13" bluebird-lst "^1.0.9" - builder-util-runtime "8.7.6" + builder-util-runtime "8.7.7" chalk "^4.1.1" debug "^4.3.2" fs-extra "^10.0.0" @@ -1692,13 +1700,13 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -dmg-builder@22.11.5: - version "22.11.5" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.5.tgz#0df9843def73a217097956982fa21bb4d6a5836e" - integrity sha512-91Shh9+OK9RwBlBURxvhSnQNibEh/JYNAnMOfFguyNbasSfF50Jme4b3dgsQrHTTTfkFijcvzykPPFAZofQs6g== +dmg-builder@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.7.tgz#5956008c18d40ee72c0ea01ffea9590dbf51df89" + integrity sha512-+I+XfP2DODHB6PwFANgpH/WMzzCA5r5XoMvbFCIYjQjJpXlO0XnqQaamzFl2vh/Wz/Qt0d0lJMgRy8gKR3MGdQ== dependencies: - app-builder-lib "22.11.5" - builder-util "22.11.5" + app-builder-lib "22.11.7" + builder-util "22.11.7" builder-util-runtime "8.7.6" fs-extra "^10.0.0" iconv-lite "^0.6.2" @@ -1812,17 +1820,17 @@ ejs@^3.1.6: dependencies: jake "^10.6.1" -electron-builder@^22.11.5: - version "22.11.5" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.5.tgz#914d8183e1bab7cda43ef1d67fc3d17314c7e242" - integrity sha512-QIhzrmSLNteItRvmAjwNpsya08oZeOJIrxFww/Alkjcwnrn5Xgog2qf3Xfa3ocuNUQIwb+mMzZrzqnPu0Mamyg== +electron-builder@^22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.7.tgz#cd97a0d9f6e6d388112e66b4376de431cca4d596" + integrity sha512-yQExSLt7Hbz/P8lLkZDdE/OnJJ7NCX+uiQcV+XIH0TeEZcD87ZnSqBBzGUN5akySU4BXXlrVZKeUsXACWrm5Kw== dependencies: - "@types/yargs" "^16.0.1" - app-builder-lib "22.11.5" - builder-util "22.11.5" - builder-util-runtime "8.7.6" + "@types/yargs" "^16.0.2" + app-builder-lib "22.11.7" + builder-util "22.11.7" + builder-util-runtime "8.7.7" chalk "^4.1.1" - dmg-builder "22.11.5" + dmg-builder "22.11.7" fs-extra "^10.0.0" is-ci "^3.0.0" lazy-val "^1.0.5" @@ -1847,14 +1855,14 @@ electron-notarize@^1.0.0: debug "^4.1.1" fs-extra "^9.0.1" -electron-publish@22.11.5: - version "22.11.5" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.5.tgz#2fcd3280c4267e70e4aa15003c9b7dc34923320e" - integrity sha512-peN4tEP80Kb6reuwKKvSu9p/XUWpx/7x747u5NSg7Kg2axBjzdMtX5ZqBThfPtJWJhSWZ7PEYWmNyUCfdQl2Ag== +electron-publish@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.7.tgz#4126cbb08ccf082a2aa7fef89ee629b3a4b8ae9a" + integrity sha512-A4EhRRNBVz4SPzUlBrPO6BmuyDeI0pyprggPAV9rQ+SDVSnSB/WKPot9JwWMyArkGj3AUUTMNVT6hwZhMvhfqw== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "22.11.5" - builder-util-runtime "8.7.6" + builder-util "22.11.7" + builder-util-runtime "8.7.7" chalk "^4.1.1" fs-extra "^10.0.0" lazy-val "^1.0.5" From 49c4c3f23f50114632c6c2dc009b52db09b20204 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Jun 2021 20:03:35 +0000 Subject: [PATCH 5/8] Bump sweetalert2 from 11.0.12 to 11.0.17 in /app Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 11.0.12 to 11.0.17. - [Release notes](https://github.com/sweetalert2/sweetalert2/releases) - [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md) - [Commits](https://github.com/sweetalert2/sweetalert2/compare/v11.0.12...v11.0.17) --- updated-dependencies: - dependency-name: sweetalert2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/package.json | 2 +- app/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/package.json b/app/package.json index 74f6d088..881e6047 100644 --- a/app/package.json +++ b/app/package.json @@ -69,7 +69,7 @@ "materialize-css": "git://github.com/cutls/materialize#v1-dev", "sanitize-html": "^2.4.0", "sumchecker": "^3.0.1", - "sweetalert2": "^11.0.12", + "sweetalert2": "^11.0.17", "system-font-families": "^0.4.1", "textarea-caret": "^3.1.0", "vue": "^2.6.12" diff --git a/app/yarn.lock b/app/yarn.lock index f6b22c7e..a4166174 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -4887,10 +4887,10 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -sweetalert2@^11.0.12: - version "11.0.12" - resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-11.0.12.tgz#7b500fad352def30412798883433b37e48cb14dc" - integrity sha512-iAn9nB1qu+8z4xjuxeJp+BfBcgReh+NDZ7P/I1r8oDMcukLtYYJxcpEbiaIpBYU4+k698WHe90oCm+UgCCVnqA== +sweetalert2@^11.0.17: + version "11.0.17" + resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-11.0.17.tgz#250b18745acf15344121070d78bcb50d62a21432" + integrity sha512-oaCGCNjMU648bDg5+/mdStfFNG9sYEejeEZQY8JpAakUM0pLflB3neNyArAZGcWNUQX1y/jOeRdzcNE05Una4A== syntax-error@^1.1.1: version "1.4.0" From 184a2bf3aa8bca68448491a1785edf394282cdd6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Jun 2021 20:04:49 +0000 Subject: [PATCH 6/8] Bump chokidar from 3.5.1 to 3.5.2 in /app Bumps [chokidar](https://github.com/paulmillr/chokidar) from 3.5.1 to 3.5.2. - [Release notes](https://github.com/paulmillr/chokidar/releases) - [Commits](https://github.com/paulmillr/chokidar/compare/3.5.1...3.5.2) --- updated-dependencies: - dependency-name: chokidar dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/package.json | 2 +- app/yarn.lock | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/package.json b/app/package.json index 74f6d088..528299a4 100644 --- a/app/package.json +++ b/app/package.json @@ -76,7 +76,7 @@ }, "devDependencies": { "browserify": "^17.0.0", - "chokidar": "^3.5.1", + "chokidar": "^3.5.2", "dotenv": "^9.0.2", "electron": "^13.0.1", "electron-builder": "^22.11.5", diff --git a/app/yarn.lock b/app/yarn.lock index f6b22c7e..0413144c 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -639,10 +639,10 @@ any-base@^1.1.0: resolved "https://registry.yarnpkg.com/any-base/-/any-base-1.1.0.tgz#ae101a62bc08a597b4c9ab5b7089d456630549fe" integrity sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg== -anymatch@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== +anymatch@~3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" @@ -1218,20 +1218,20 @@ char-regex@^1.0.2: resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== -chokidar@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" - integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== +chokidar@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" + integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== dependencies: - anymatch "~3.1.1" + anymatch "~3.1.2" braces "~3.0.2" - glob-parent "~5.1.0" + glob-parent "~5.1.2" is-binary-path "~2.1.0" is-glob "~4.0.1" normalize-path "~3.0.0" - readdirp "~3.5.0" + readdirp "~3.6.0" optionalDependencies: - fsevents "~2.3.1" + fsevents "~2.3.2" chownr@^1.1.1: version "1.1.4" @@ -2355,10 +2355,10 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@~2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f" - integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw== +fsevents@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== function-bind@^1.1.1: version "1.1.1" @@ -2441,10 +2441,10 @@ gifwrap@^0.9.2: image-q "^1.1.1" omggif "^1.0.10" -glob-parent@^5.0.0, glob-parent@~5.1.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" - integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== +glob-parent@^5.0.0, glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" @@ -4241,10 +4241,10 @@ readable-stream@^3.5.0, readable-stream@^3.6.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" -readdirp@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" - integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== dependencies: picomatch "^2.2.1" From d62bc573685e50c57e8fa942caaf8b4ae8317c69 Mon Sep 17 00:00:00 2001 From: cutls Date: Fri, 18 Jun 2021 16:16:37 +0900 Subject: [PATCH 7/8] add new fi --- app/js/tl/directory.js | 160 +- app/js/tl/tl.js | 2846 ++++++++++++----------- app/view/make/index.sample.html | 2395 +++++++++---------- app/view/make/language/en/index.json | 341 +-- app/view/make/language/ja-KS/index.json | 341 +-- app/view/make/language/ja/index.json | 339 +-- app/view/pl-PL/index.html | 2395 +++++++++---------- app/view/pl-PL/setting.html | 4 +- 8 files changed, 4235 insertions(+), 4586 deletions(-) diff --git a/app/js/tl/directory.js b/app/js/tl/directory.js index 73679e1d..deab97c1 100644 --- a/app/js/tl/directory.js +++ b/app/js/tl/directory.js @@ -1,78 +1,96 @@ //ディレクトリ //ディレクトリトグル function dirMenu() { - $("#dir-contents").html("") - directory() - $("#left-menu a").removeClass("active") - $("#dirMenu").addClass("active") - $(".menu-content").addClass("hide") - $("#dir-box").removeClass("hide") + $('#dir-contents').html('') + directory('directory') + $('#left-menu a').removeClass('active') + $('#dirMenu').addClass('active') + $('.menu-content').addClass('hide') + $('#dir-box').removeClass('hide') } + function dirselCk() { - var acct = $("#dir-acct-sel").val() - if (acct == "noauth") { - $("#dirNoAuth").removeClass("hide") - } else { - $("#dirNoAuth").addClass("hide") - directory() - } + var acct = $('#dir-acct-sel').val() + if (acct == 'noauth') { + $('#dirNoAuth').removeClass('hide') + } else { + $('#dirNoAuth').addClass('hide') + directory('check') + } } -function directory(isMore) { - var order = $("[name=sort]:checked").val() - if (!order) { - order = "active" - } - var local_only = $("#local_only:checked").val() - if (local_only) { - local_only = "true" - } else { - local_only = "false" - } - var acct_id = $("#dir-acct-sel").val() - if (acct_id == "noauth") { - var domain = $("#dirNoAuth-url").val() - var at = "" - } else { - var domain = localStorage.getItem("domain_" + acct_id) - var at = localStorage.getItem("acct_" + acct_id + "_at") - } - if (isMore) { - var addOffset = $("#dir-contents .cvo").length - $("#dir-contents").append(`
`) - } else { - var addOffset = 0 - $("#dir-contents").html(`
`) - } - var start = "https://" + domain + "/api/v1/directory?order=" + order + "&local=" + local_only + "&offset=" + addOffset - console.log(start) - fetch(start, { - method: "GET", - headers: { - "content-type": "application/json", - Authorization: "Bearer " + at - } - }) - .then(function (response) { - $("#dir-contents .progress").remove() - if (!response.ok) { - response.text().then(function (text) { - setLog(response.url, response.status, text) - }) - } - return response.json() - }) - .catch(function (error) { - setLog(start, "JSON", error) - console.error(error) - }) - .then(function (json) { - if (json) { - $("#moreDir").removeClass("disabled") - var html = userparse(json, null, acct_id, "dir", null) - $("#dir-contents").append(html) - jQuery("time.timeago").timeago() - } else { - $("#moreDir").addClass("disabled") - } - }) + +function dirChange(mode) { + if (mode === 'directory') $('#directoryConfig').removeClass('hide') + if (mode === 'suggest') $('#directoryConfig').addClass('hide') + directory(mode) } + +function directory(modeRaw, isMore) { + const mode = modeRaw === 'check' ? $('[name=dirsug]:checked').val() : modeRaw + var order = $('[name=sort]:checked').val() + if (!order) { + order = 'active' + } + var local_only = $('#local_only:checked').val() + if (local_only) { + local_only = 'true' + } else { + local_only = 'false' + } + var acct_id = $('#dir-acct-sel').val() + if (acct_id == 'noauth') { + var domain = $('#dirNoAuth-url').val() + var at = '' + } else { + var domain = localStorage.getItem('domain_' + acct_id) + var at = localStorage.getItem('acct_' + acct_id + '_at') + } + if (isMore) { + var addOffset = $('#dir-contents .cvo').length + $('#dir-contents').append(`
`) + } else { + var addOffset = 0 + $('#dir-contents').html(`
`) + } + let start = `https://${domain}/api/v1/directory?order=${order}&local=${local_only}&offset=${addOffset}` + if (mode === 'suggest') start = `https://${domain}/api/v2/suggestions` + console.log(start) + fetch(start, { + method: 'GET', + headers: { + 'content-type': 'application/json', + Authorization: 'Bearer ' + at, + }, + }) + .then(function(response) { + $('#dir-contents .progress').remove() + if (!response.ok) { + $('#dir-contents').html(`v2 follow suggestion is supported by Mastodon 3.4.0 or above.`) + response.text().then(function(text) { + setLog(response.url, response.status, text) + }) + } + return response.json() + }) + .catch(function(error) { + setLog(start, 'JSON', error) + console.error(error) + }) + .then(function(json) { + if (json) { + $('#moreDir').removeClass('disabled') + let obj = [] + if (mode === 'suggest') { + $('#moreDir').addClass('disabled') + for (const suggest of json) obj.push(suggest.account) + } else { + obj = json + } + var html = userparse(obj, null, acct_id, 'dir', null) + $('#dir-contents').append(html) + jQuery('time.timeago').timeago() + } else { + $('#moreDir').addClass('disabled') + } + }) +} \ No newline at end of file diff --git a/app/js/tl/tl.js b/app/js/tl/tl.js index 63cbc24c..958d96a9 100644 --- a/app/js/tl/tl.js +++ b/app/js/tl/tl.js @@ -1,1491 +1,1497 @@ //TL取得 moreloading = false var errorct = 0 + function tl(type, data, acct_id, tlid, delc, voice, mode) { - scrollevent() - $('#unread_' + tlid + ' .material-icons').removeClass('teal-text') - localStorage.removeItem('pool') - var domain = localStorage.getItem('domain_' + acct_id) - //タグとかの場合はカラム追加して描画 - if (tlid == 'add') { - console.log('add new column') - var newtab = $('.box').length - if (type == 'tag') { - data = { - name: data, - any: [], - all: [], - none: [], - } - } - var add = { - domain: acct_id, - type: type, - data: data, - } - var multi = localStorage.getItem('column') - var obj = JSON.parse(multi) - localStorage.setItem('card_' + obj.length, 'true') - obj.push(add) - var json = JSON.stringify(obj) - localStorage.setItem('column', json) - parseColumn('add') - return - } + scrollevent() + $('#unread_' + tlid + ' .material-icons').removeClass('teal-text') + localStorage.removeItem('pool') + var domain = localStorage.getItem('domain_' + acct_id) + //タグとかの場合はカラム追加して描画 + if (tlid == 'add') { + console.log('add new column') + var newtab = $('.box').length + if (type == 'tag') { + data = { + name: data, + any: [], + all: [], + none: [], + } + } + var add = { + domain: acct_id, + type: type, + data: data, + } + var multi = localStorage.getItem('column') + var obj = JSON.parse(multi) + localStorage.setItem('card_' + obj.length, 'true') + obj.push(add) + var json = JSON.stringify(obj) + localStorage.setItem('column', json) + parseColumn('add') + return + } - if (!type) { - var type = localStorage.getItem('now') - if (!type) { - //デフォルト - var type = 'local' - } - } - if (type == 'mix' && localStorage.getItem('mode_' + domain) != 'misskey') { - //Integratedなら飛ばす - $('#notice_' + tlid).text( - 'Integrated TL(' + - localStorage.getItem('user_' + acct_id) + - '@' + - domain + - ')' - ) - $('#notice_icon_' + tlid).text('merge_type') - mixtl(acct_id, tlid, 'integrated', delc, voice) - return - } else if (type == 'plus') { - //Local+なら飛ばす - $('#notice_' + tlid).text( - 'Local+ TL(' + - localStorage.getItem('user_' + acct_id) + - '@' + - domain + - ')' - ) - $('#notice_icon_' + tlid).text('people_outline') - mixtl(acct_id, tlid, 'plus', delc, voice) - return - } else if (type == 'notf') { - //通知なら飛ばす - notf(acct_id, tlid, 'direct') - $('#notice_' + tlid).text( - cap(type, data, acct_id) + - '(' + - localStorage.getItem('user_' + acct_id) + - '@' + - domain + - ')' - ) - $('#notice_icon_' + tlid).text('notifications') - return - } else if (type == 'bookmark') { - //ブックマークなら飛ばす - getBookmark(acct_id, tlid) - $('#notice_' + tlid).text( - cap(type, data, acct_id) + - '(' + - localStorage.getItem('user_' + acct_id) + - '@' + - domain + - ')' - ) - $('#notice_icon_' + tlid).text('bookmark') - return - } else if (type == 'utl') { - //UTLなら飛ばす - getUtl(acct_id, tlid, data, false) - $('#notice_' + tlid).text( - cap(type, data, acct_id) + - '(' + - localStorage.getItem('user_' + acct_id) + - '@' + - domain + - ')' - ) - $('#notice_icon_' + tlid).text('person') - return - } else if (type == 'home') { - //ホームならお知らせ「も」取りに行く - announ(acct_id, tlid) - } - localStorage.setItem('now', type) - todo(cap(type) + ' TL Loading...') - var at = localStorage.getItem('acct_' + acct_id + '_at') - if (type != 'noauth') { - var hdr = { - 'content-type': 'application/json', - Authorization: 'Bearer ' + at, - } - $('#notice_' + tlid).text( - cap(type, data, acct_id) + - '(' + - localStorage.getItem('user_' + acct_id) + - '@' + - domain + - ')' - ) - } else { - var hdr = { - 'content-type': 'application/json', - } - domain = acct_id - $('#notice_' + tlid).text('Glance TL(' + domain + ')') - } - $('#notice_icon_' + tlid).text(icon(type)) - if (localStorage.getItem('mode_' + domain) == 'misskey') { - var misskey = true - var url = misskeycom(type, data) - var start = 'https://' + domain + '/api/notes/' + url - var method = 'POST' - var req = {} - if (type != 'noauth') { - req.i = at - } + if (!type) { + var type = localStorage.getItem('now') + if (!type) { + //デフォルト + var type = 'local' + } + } + if (type == 'mix' && localStorage.getItem('mode_' + domain) != 'misskey') { + //Integratedなら飛ばす + $('#notice_' + tlid).text( + 'Integrated TL(' + + localStorage.getItem('user_' + acct_id) + + '@' + + domain + + ')' + ) + $('#notice_icon_' + tlid).text('merge_type') + mixtl(acct_id, tlid, 'integrated', delc, voice) + return + } else if (type == 'plus') { + //Local+なら飛ばす + $('#notice_' + tlid).text( + 'Local+ TL(' + + localStorage.getItem('user_' + acct_id) + + '@' + + domain + + ')' + ) + $('#notice_icon_' + tlid).text('people_outline') + mixtl(acct_id, tlid, 'plus', delc, voice) + return + } else if (type == 'notf') { + //通知なら飛ばす + notf(acct_id, tlid, 'direct') + $('#notice_' + tlid).text( + cap(type, data, acct_id) + + '(' + + localStorage.getItem('user_' + acct_id) + + '@' + + domain + + ')' + ) + $('#notice_icon_' + tlid).text('notifications') + return + } else if (type == 'bookmark') { + //ブックマークなら飛ばす + getBookmark(acct_id, tlid) + $('#notice_' + tlid).text( + cap(type, data, acct_id) + + '(' + + localStorage.getItem('user_' + acct_id) + + '@' + + domain + + ')' + ) + $('#notice_icon_' + tlid).text('bookmark') + return + } else if (type == 'utl') { + //UTLなら飛ばす + getUtl(acct_id, tlid, data, false) + $('#notice_' + tlid).text( + cap(type, data, acct_id) + + '(' + + localStorage.getItem('user_' + acct_id) + + '@' + + domain + + ')' + ) + $('#notice_icon_' + tlid).text('person') + return + } else if (type == 'home') { + //ホームならお知らせ「も」取りに行く + announ(acct_id, tlid) + } + localStorage.setItem('now', type) + todo(cap(type) + ' TL Loading...') + var at = localStorage.getItem('acct_' + acct_id + '_at') + if (type != 'noauth') { + var hdr = { + 'content-type': 'application/json', + Authorization: 'Bearer ' + at, + } + $('#notice_' + tlid).text( + cap(type, data, acct_id) + + '(' + + localStorage.getItem('user_' + acct_id) + + '@' + + domain + + ')' + ) + } else { + var hdr = { + 'content-type': 'application/json', + } + domain = acct_id + $('#notice_' + tlid).text('Glance TL(' + domain + ')') + } + $('#notice_icon_' + tlid).text(icon(type)) + if (localStorage.getItem('mode_' + domain) == 'misskey') { + var misskey = true + var url = misskeycom(type, data) + var start = 'https://' + domain + '/api/notes/' + url + var method = 'POST' + var req = {} + if (type != 'noauth') { + req.i = at + } - if (type == 'local-media' || type == 'pub-media') { - req.mediaOnly = true - } - if (type == 'tag') { - req.tag = data - } - if (type == 'list') { - req.listId = data - } - req.limit = 20 - var i = { - method: method, - headers: hdr, - body: JSON.stringify(req), - } - } else { - var misskey = false - var url = com(type, data, tlid) - if (type == 'tag') { - var tag = localStorage.getItem('tag-range') - if (tag == 'local') { - url = url + 'local=true' - } - } - if (type == 'dm') { - var start = 'https://' + domain + '/api/v1/conversations' - } else { - var start = 'https://' + domain + '/api/v1/timelines/' + url - } - var method = 'GET' - var i = { - method: method, - headers: hdr, - } - } + if (type == 'local-media' || type == 'pub-media') { + req.mediaOnly = true + } + if (type == 'tag') { + req.tag = data + } + if (type == 'list') { + req.listId = data + } + req.limit = 20 + var i = { + method: method, + headers: hdr, + body: JSON.stringify(req), + } + } else { + var misskey = false + var url = com(type, data, tlid) + if (type == 'tag') { + var tag = localStorage.getItem('tag-range') + if (tag == 'local') { + url = url + 'local=true' + } + } + if (type == 'dm') { + var start = 'https://' + domain + '/api/v1/conversations' + } else { + var start = 'https://' + domain + '/api/v1/timelines/' + url + } + var method = 'GET' + var i = { + method: method, + headers: hdr, + } + } - console.log(['Try to get timeline of ' + tlid, start]) - fetch(start, i) - .then(function (response) { - if (!response.ok) { - response.text().then(function (text) { - $('#landing_' + tlid).append(`
${response.status}
${escapeHTML(text)}`) - setLog(response.url, response.status, text) - }) - } - return response.json() - }) - .catch(function (error) { - todo(error) - setLog(start, 'JSON', error) - console.error(error) - }) - .then(function (json) { - if(!json) return true - console.log(['Result of getting timeline of ' + tlid, json]) - $('#landing_' + tlid).hide() - var mute = getFilterTypeByAcct(acct_id, type) - if (misskey) { - var templete = misskeyParse(json, type, acct_id, tlid, '', mute) - } else { - var templete = parse(json, type, acct_id, tlid, '', mute, type) - localStorage.setItem('lastobj_' + tlid, json[0].id) - } - $('#timeline_' + tlid).html(templete) - additional(acct_id, tlid) - jQuery('time.timeago').timeago() - todc() - reload(type, 'from timeline to reload', acct_id, tlid, data, mute, delc, voice) - if (type == 'home' || type == 'notf') { - //Markers - var markers = localStorage.getItem('markers') - if (markers == 'yes') { - markers = true - } else { - markers = false - } - if (markers) { - getMarker(tlid, type, acct_id) - } - } - $(window).scrollTop(0) - }) + console.log(['Try to get timeline of ' + tlid, start]) + fetch(start, i) + .then(function(response) { + if (!response.ok) { + response.text().then(function(text) { + $('#landing_' + tlid).append(`
${response.status}
${$.strip_tags(text)}`) + setLog(response.url, response.status, text) + }) + } + return response.json() + }) + .catch(function(error) { + todo(error) + setLog(start, 'JSON', error) + console.error(error) + }) + .then(function(json) { + if (!json) return true + console.log(['Result of getting timeline of ' + tlid, json]) + $('#landing_' + tlid).hide() + var mute = getFilterTypeByAcct(acct_id, type) + if (misskey) { + var templete = misskeyParse(json, type, acct_id, tlid, '', mute) + } else { + var templete = parse(json, type, acct_id, tlid, '', mute, type) + localStorage.setItem('lastobj_' + tlid, json[0].id) + } + $('#timeline_' + tlid).html(templete) + additional(acct_id, tlid) + jQuery('time.timeago').timeago() + todc() + reload(type, 'from timeline to reload', acct_id, tlid, data, mute, delc, voice) + if (type == 'home' || type == 'notf') { + //Markers + var markers = localStorage.getItem('markers') + if (markers == 'yes') { + markers = true + } else { + markers = false + } + if (markers) { + getMarker(tlid, type, acct_id) + } + } + $(window).scrollTop(0) + }) } //Streaming接続 function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) { - if (!type) { - var type = localStorage.getItem('now') - } - var domain = localStorage.getItem('domain_' + acct_id) - var at = localStorage.getItem('acct_' + acct_id + '_at') - localStorage.setItem('now', type) - if (localStorage.getItem('mode_' + domain) == 'misskey') { - var misskey = true - var key = localStorage.getItem('misskey_wss_' + acct_id) - var send = - '{"type":"connect","body":{"channel":"' + - typePs(type) + - '","id":"' + - tlid + - '"}}' - var mskyset = setInterval(function () { - if (misskeywsstate[key]) { - misskeyws[key].send(send) - clearInterval(mskyset) - } - }, 100) - } else { - var domain = localStorage.getItem('domain_' + acct_id) - if (mastodonBaseWsStatus[domain] == 'cannotuse') { - oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) - } else if (mastodonBaseWsStatus[domain] == 'undetected' || mastodonBaseWsStatus[domain] == 'connecting') { - const mbws = setInterval(function () { - if (mastodonBaseWsStatus[domain] == 'cannotuse') { - oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) - clearInterval(mbws) - } else if (mastodonBaseWsStatus[domain] == 'available') { - $('#notice_icon_' + tlid).removeClass('red-text') - stremaingSubscribe(type, acct_id, data) - clearInterval(mbws) - } - }, 1000) - } else if (mastodonBaseWsStatus[domain] == 'available') { - $('#notice_icon_' + tlid).removeClass('red-text') - stremaingSubscribe(type, acct_id, data) - } - } + if (!type) { + var type = localStorage.getItem('now') + } + var domain = localStorage.getItem('domain_' + acct_id) + var at = localStorage.getItem('acct_' + acct_id + '_at') + localStorage.setItem('now', type) + if (localStorage.getItem('mode_' + domain) == 'misskey') { + var misskey = true + var key = localStorage.getItem('misskey_wss_' + acct_id) + var send = + '{"type":"connect","body":{"channel":"' + + typePs(type) + + '","id":"' + + tlid + + '"}}' + var mskyset = setInterval(function() { + if (misskeywsstate[key]) { + misskeyws[key].send(send) + clearInterval(mskyset) + } + }, 100) + } else { + var domain = localStorage.getItem('domain_' + acct_id) + if (mastodonBaseWsStatus[domain] == 'cannotuse') { + oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) + } else if (mastodonBaseWsStatus[domain] == 'undetected' || mastodonBaseWsStatus[domain] == 'connecting') { + const mbws = setInterval(function() { + if (mastodonBaseWsStatus[domain] == 'cannotuse') { + oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) + clearInterval(mbws) + } else if (mastodonBaseWsStatus[domain] == 'available') { + $('#notice_icon_' + tlid).removeClass('red-text') + stremaingSubscribe(type, acct_id, data) + clearInterval(mbws) + } + }, 1000) + } else if (mastodonBaseWsStatus[domain] == 'available') { + $('#notice_icon_' + tlid).removeClass('red-text') + stremaingSubscribe(type, acct_id, data) + } + } } -function stremaingSubscribe(type, acct_id, data, unsubscribe) { - let command = 'subscribe' - if (unsubscribe) command = 'unsubscribe' - let stream - const domain = localStorage.getItem('domain_' + acct_id) - if(type == 'home') return false - if (type === 'local' || type === 'mix') { stream = 'public:local' } - else if (type === 'local-media') { stream = 'public:local:media' } - else if (type === 'pub') { stream = 'public' } - else if (type === 'pub-media') { stream = 'public:media' } - else if (type === 'list') { - mastodonBaseWs[domain].send(JSON.stringify({type: command, stream: 'list', list: data})) - return true - } else if (type === 'tag') { - let arr = [] - let name = data - if (data.name) name = data.name - arr.push(name) - if (data.any) arr = arr.concat(data.any.split(',')) - if (data.all) arr = arr.concat(data.all.split(',')) - for (const tag of arr) { - mastodonBaseWs[domain].send(JSON.stringify({type: command, stream: 'hashtag', tag: tag})) - } - return true - } - mastodonBaseWs[domain].send(JSON.stringify({type: command, stream: stream})) -} -function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) { - var misskey = false - const domain = localStorage.getItem(`domain_${acct_id}`) - var at = localStorage.getItem('acct_' + acct_id + '_at') - if (localStorage.getItem('streaming_' + acct_id)) { - var wss = localStorage.getItem('streaming_' + acct_id).replace('https://', 'wss://') - } else { - var wss = 'wss://' + domain - } - if (type == 'home') { - var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at - } else if (type == 'pub') { - var add = '' - if (remoteOnlyCk(tlid)) { - add = '&remote=true' - } - var start = wss + '/api/v1/streaming/?stream=public&access_token=' + at + add - } else if (type == 'pub-media') { - var add = '' - if (remoteOnlyCk(tlid)) { - add = '&remote=true' - } var start = - wss + '/api/v1/streaming/?stream=public:media&access_token=' + at + add - } else if (type == 'local') { - var start = - wss + '/api/v1/streaming/?stream=public:local&access_token=' + at - } else if (type == 'local-media') { - var start = - wss + - '/api/v1/streaming/?stream=public:local:media&only_media=true&access_token=' + - at - } else if (type == 'tag') { - var tag = localStorage.getItem('tag-range') - if (tag == 'local') { - data = data + '&local=true' - } - if (data.name) { - data = data.name - } - var start = - wss + - '/api/v1/streaming/?stream=hashtag&tag=' + - data + - '&access_token=' + - at + add - } else if (type == 'noauth') { - var start = 'wss://' + acct_id + '/api/v1/streaming/?stream=public:local' - } else if (type == 'list') { - var start = - wss + - '/api/v1/streaming/?stream=list&list=' + - data + - '&access_token=' + - at - } else if (type == 'dm') { - var start = wss + '/api/v1/streaming/?stream=direct&access_token=' + at - } - var wsid = websocket.length - localStorage.setItem('wss_' + tlid, wsid) - websocket[wsid] = new WebSocket(start) - websocket[wsid].onopen = function (mess) { - console.table({ - tlid: tlid, - type: 'Connect Streaming API' + type, - domain: domain, - message: [mess], - }) - errorct = 0 - $('#notice_icon_' + tlid).removeClass('red-text') - } - websocket[wsid].onmessage = function (mess) { - console.log([tlid + ':Receive Streaming API:', JSON.parse(mess.data)]) - if (misskey) { - if (JSON.parse(mess.data).type == 'note') { - var obj = JSON.parse(mess.data).body - if (voice) { - say(obj.text) - } - websocketNotf[acct_id].send( - JSON.stringify({ - type: 'capture', - id: obj.id, - }) - ) - var templete = misskeyParse([obj], type, acct_id, tlid, '', mute) - var pool = localStorage.getItem('pool_' + tlid) - if (pool) { - pool = templete + pool - } else { - pool = templete - } - localStorage.setItem('pool_' + tlid, pool) - scrollck() - jQuery('time.timeago').timeago() - } - } else { - var typeA = JSON.parse(mess.data).event - if (typeA == 'delete') { - var obj = JSON.parse(mess.data).payload - if (delc == 'true') { - $( - '#timeline_' + - tlid + - ' [unique-id=' + - JSON.parse(mess.data).payload + - ']' - ).addClass('emphasized') - $( - '#timeline_' + - tlid + - ' [unique-id=' + - JSON.parse(mess.data).payload + - ']' - ).addClass('by_delcatch') - } else { - $('[unique-id=' + JSON.parse(mess.data).payload + ']').hide() - $('[unique-id=' + JSON.parse(mess.data).payload + ']').remove() - } - } else if (typeA == 'update' || typeA == 'conversation') { - if ( - !$('#unread_' + tlid + ' .material-icons').hasClass('teal-text') - ) { - //markers show中はダメ - var obj = JSON.parse(JSON.parse(mess.data).payload) - if ( - $('#timeline_' + tlid + ' [toot-id=' + obj.id + ']').length < 1 - ) { - if (voice) { - say(obj.content) - } - var templete = parse([obj], type, acct_id, tlid, '', mute, type) - if ( - $('timeline_box_' + tlid + '_box .tl-box').scrollTop() === 0 - ) { - $('#timeline_' + tlid).prepend(templete) - } else { - var pool = localStorage.getItem('pool_' + tlid) - if (pool) { - pool = templete + pool - } else { - pool = templete - } - localStorage.setItem('pool_' + tlid, pool) - } - scrollck() - additional(acct_id, tlid) - jQuery('time.timeago').timeago() - } else { - todo('二重取得発生中') - } - todc() - } - } else if (typeA == 'filters_changed') { - filterUpdate(acct_id) - } else if (~typeA.indexOf('announcement')) { - announ(acct_id, tlid) - } - } - } - websocket[wsid].onerror = function (error) { - console.error('Error closing') - console.error(error) - if (mode == 'error') { - $('#notice_icon_' + tlid).addClass('red-text') - todo('WebSocket Error ' + error) - } else { - errorct++ - console.log(errorct) - if (errorct < 3) { - reconnector(tlid, type, acct_id, data, 'error') - } - } - return false - } - websocket[wsid].onclose = function () { - console.warn('Closing ' + tlid) - if (mode == 'error') { - $('#notice_icon_' + tlid).addClass('red-text') - todo('WebSocket Closed') - } else { - errorct++ - console.log(errorct) - if (errorct < 3) { - reconnector(tlid, type, acct_id, data, 'error') - } - } - return false - } +function stremaingSubscribe(type, acct_id, data, unsubscribe) { + let command = 'subscribe' + if (unsubscribe) command = 'unsubscribe' + let stream + const domain = localStorage.getItem('domain_' + acct_id) + if (type == 'home') return false + if (type === 'local' || type === 'mix') { stream = 'public:local' } else if (type === 'local-media') { stream = 'public:local:media' } else if (type === 'pub') { stream = 'public' } else if (type === 'pub-media') { stream = 'public:media' } else if (type === 'list') { + mastodonBaseWs[domain].send(JSON.stringify({ type: command, stream: 'list', list: data })) + return true + } else if (type === 'tag') { + let arr = [] + let name = data + if (data.name) name = data.name + arr.push(name) + if (data.any) arr = arr.concat(data.any.split(',')) + if (data.all) arr = arr.concat(data.all.split(',')) + for (const tag of arr) { + mastodonBaseWs[domain].send(JSON.stringify({ type: command, stream: 'hashtag', tag: tag })) + } + return true + } + mastodonBaseWs[domain].send(JSON.stringify({ type: command, stream: stream })) +} + +function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) { + var misskey = false + const domain = localStorage.getItem(`domain_${acct_id}`) + var at = localStorage.getItem('acct_' + acct_id + '_at') + if (localStorage.getItem('streaming_' + acct_id)) { + var wss = localStorage.getItem('streaming_' + acct_id).replace('https://', 'wss://') + } else { + var wss = 'wss://' + domain + } + if (type == 'home') { + var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at + } else if (type == 'pub') { + var add = '' + if (remoteOnlyCk(tlid)) { + add = '&remote=true' + } + var start = wss + '/api/v1/streaming/?stream=public&access_token=' + at + add + } else if (type == 'pub-media') { + var add = '' + if (remoteOnlyCk(tlid)) { + add = '&remote=true' + } + var start = + wss + '/api/v1/streaming/?stream=public:media&access_token=' + at + add + } else if (type == 'local') { + var start = + wss + '/api/v1/streaming/?stream=public:local&access_token=' + at + } else if (type == 'local-media') { + var start = + wss + + '/api/v1/streaming/?stream=public:local:media&only_media=true&access_token=' + + at + } else if (type == 'tag') { + var tag = localStorage.getItem('tag-range') + if (tag == 'local') { + data = data + '&local=true' + } + if (data.name) { + data = data.name + } + var start = + wss + + '/api/v1/streaming/?stream=hashtag&tag=' + + data + + '&access_token=' + + at + add + } else if (type == 'noauth') { + var start = 'wss://' + acct_id + '/api/v1/streaming/?stream=public:local' + } else if (type == 'list') { + var start = + wss + + '/api/v1/streaming/?stream=list&list=' + + data + + '&access_token=' + + at + } else if (type == 'dm') { + var start = wss + '/api/v1/streaming/?stream=direct&access_token=' + at + } + var wsid = websocket.length + localStorage.setItem('wss_' + tlid, wsid) + websocket[wsid] = new WebSocket(start) + websocket[wsid].onopen = function(mess) { + console.table({ + tlid: tlid, + type: 'Connect Streaming API' + type, + domain: domain, + message: [mess], + }) + errorct = 0 + $('#notice_icon_' + tlid).removeClass('red-text') + } + websocket[wsid].onmessage = function(mess) { + console.log([tlid + ':Receive Streaming API:', JSON.parse(mess.data)]) + if (misskey) { + if (JSON.parse(mess.data).type == 'note') { + var obj = JSON.parse(mess.data).body + if (voice) { + say(obj.text) + } + websocketNotf[acct_id].send( + JSON.stringify({ + type: 'capture', + id: obj.id, + }) + ) + var templete = misskeyParse([obj], type, acct_id, tlid, '', mute) + var pool = localStorage.getItem('pool_' + tlid) + if (pool) { + pool = templete + pool + } else { + pool = templete + } + localStorage.setItem('pool_' + tlid, pool) + scrollck() + jQuery('time.timeago').timeago() + } + } else { + var typeA = JSON.parse(mess.data).event + if (typeA == 'delete') { + var obj = JSON.parse(mess.data).payload + if (delc == 'true') { + $( + '#timeline_' + + tlid + + ' [unique-id=' + + JSON.parse(mess.data).payload + + ']' + ).addClass('emphasized') + $( + '#timeline_' + + tlid + + ' [unique-id=' + + JSON.parse(mess.data).payload + + ']' + ).addClass('by_delcatch') + } else { + $('[unique-id=' + JSON.parse(mess.data).payload + ']').hide() + $('[unique-id=' + JSON.parse(mess.data).payload + ']').remove() + } + } else if (typeA == 'update' || typeA == 'conversation') { + if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) { + //markers show中はダメ + var obj = JSON.parse(JSON.parse(mess.data).payload) + if ( + $('#timeline_' + tlid + ' [toot-id=' + obj.id + ']').length < 1 + ) { + if (voice) { + say(obj.content) + } + var templete = parse([obj], type, acct_id, tlid, '', mute, type) + if ( + $('timeline_box_' + tlid + '_box .tl-box').scrollTop() === 0 + ) { + $('#timeline_' + tlid).prepend(templete) + } else { + var pool = localStorage.getItem('pool_' + tlid) + if (pool) { + pool = templete + pool + } else { + pool = templete + } + localStorage.setItem('pool_' + tlid, pool) + } + scrollck() + additional(acct_id, tlid) + jQuery('time.timeago').timeago() + } else { + todo('二重取得発生中') + } + + todc() + } + } else if (typeA == 'filters_changed') { + filterUpdate(acct_id) + } else if (~typeA.indexOf('announcement')) { + announ(acct_id, tlid) + } + } + } + websocket[wsid].onerror = function(error) { + console.error('Error closing') + console.error(error) + if (mode == 'error') { + $('#notice_icon_' + tlid).addClass('red-text') + todo('WebSocket Error ' + error) + } else { + errorct++ + console.log(errorct) + if (errorct < 3) { + reconnector(tlid, type, acct_id, data, 'error') + } + } + return false + } + websocket[wsid].onclose = function() { + console.warn('Closing ' + tlid) + if (mode == 'error') { + $('#notice_icon_' + tlid).addClass('red-text') + todo('WebSocket Closed') + } else { + errorct++ + console.log(errorct) + if (errorct < 3) { + reconnector(tlid, type, acct_id, data, 'error') + } + } + return false + } } //一定のスクロールで発火 function moreload(type, tlid) { - var multi = localStorage.getItem('column') - var obj = JSON.parse(multi) - var acct_id = obj[tlid].domain - if (!type) { - var type = obj[tlid].type - } else { - var data - } - if (type == 'tag') { - var data = obj[tlid].data - var tag = localStorage.getItem('tag-range') - if (tag == 'local') { - data = data + '&local=true' - } - } else if (type == 'list') { - var data = obj[tlid].data - } - var sid = $('#timeline_' + tlid + ' .cvo') - .last() - .attr('unique-id') - if (sid && !moreloading) { - if ( - type == 'mix' && - localStorage.getItem( - 'mode_' + localStorage.getItem('domain_' + acct_id) - ) != 'misskey' - ) { - mixmore(tlid, 'integrated') - return - } else if ( - type == 'plus' && - localStorage.getItem( - 'mode_' + localStorage.getItem('domain_' + acct_id) - ) != 'misskey' - ) { - mixmore(tlid, 'plus') - return - } else if (type == 'notf') { - notfmore(tlid) - return - } else if (type == 'tootsearch') { - var data = obj[tlid].data - moreTs(tlid, data) - return - } else if (type == 'bookmark') { - getBookmark(acct_id, tlid, true) - return - } else if (type == 'utl') { - var data = obj[tlid].data - getUtl(acct_id, tlid, data, true) - return - } - moreloading = true - localStorage.setItem('now', type) - todo(cap(type) + ' TL MoreLoading') - if (type != 'noauth') { - var at = localStorage.getItem('acct_' + acct_id + '_at') - var hdr = { - 'content-type': 'application/json', - Authorization: 'Bearer ' + at, - } - var domain = localStorage.getItem('domain_' + acct_id) - } else { - var hdr = { - 'content-type': 'application/json', - } - domain = acct_id - } - if (localStorage.getItem('mode_' + domain) == 'misskey') { - var misskey = true - hdr = { - 'content-type': 'application/json', - } - var url = misskeycom(type, data) - var start = 'https://' + domain + '/api/notes/' + url - var method = 'POST' - var req = {} - if (type != 'noauth') { - req.i = at - } - if (type == 'local-media' || type == 'pub-media') { - req.mediaOnly = true - } - if (type == 'tag') { - req.tag = data - } - if (type == 'list') { - req.listId = data - } - req.untilId = sid - req.limit = 20 - var i = { - method: method, - headers: hdr, - body: JSON.stringify(req), - } - } else { - var misskey = false - var start = - 'https://' + - domain + - '/api/v1/timelines/' + - com(type, data, tlid) + - 'max_id=' + - sid - if (type == 'dm') { - var start = - 'https://' + domain + '/api/v1/conversations?' + 'max_id=' + sid - } - var method = 'GET' - var i = { - method: method, - headers: hdr, - } - } - fetch(start, i) - .then(function (response) { - if (!response.ok) { - response.text().then(function (text) { - setLog(response.url, response.status, text) - }) - } - return response.json() - }) - .catch(function (error) { - todo(error) - setLog(start, 'JSON', error) - console.error(error) - }) - .then(function (json) { - var mute = getFilterTypeByAcct(acct_id, type) - if (misskey) { - var templete = misskeyParse(json, '', acct_id, tlid, '', mute) - } else { - var templete = parse(json, '', acct_id, tlid, '', mute, type) - } - $('#timeline_' + tlid).append(templete) - additional(acct_id, tlid) - jQuery('time.timeago').timeago() - moreloading = false - todc() - }) - } + var multi = localStorage.getItem('column') + var obj = JSON.parse(multi) + var acct_id = obj[tlid].domain + if (!type) { + var type = obj[tlid].type + } else { + var data + } + if (type == 'tag') { + var data = obj[tlid].data + var tag = localStorage.getItem('tag-range') + if (tag == 'local') { + data = data + '&local=true' + } + } else if (type == 'list') { + var data = obj[tlid].data + } + var sid = $('#timeline_' + tlid + ' .cvo') + .last() + .attr('unique-id') + if (sid && !moreloading) { + if ( + type == 'mix' && + localStorage.getItem( + 'mode_' + localStorage.getItem('domain_' + acct_id) + ) != 'misskey' + ) { + mixmore(tlid, 'integrated') + return + } else if ( + type == 'plus' && + localStorage.getItem( + 'mode_' + localStorage.getItem('domain_' + acct_id) + ) != 'misskey' + ) { + mixmore(tlid, 'plus') + return + } else if (type == 'notf') { + notfmore(tlid) + return + } else if (type == 'tootsearch') { + var data = obj[tlid].data + moreTs(tlid, data) + return + } else if (type == 'bookmark') { + getBookmark(acct_id, tlid, true) + return + } else if (type == 'utl') { + var data = obj[tlid].data + getUtl(acct_id, tlid, data, true) + return + } + moreloading = true + localStorage.setItem('now', type) + todo(cap(type) + ' TL MoreLoading') + if (type != 'noauth') { + var at = localStorage.getItem('acct_' + acct_id + '_at') + var hdr = { + 'content-type': 'application/json', + Authorization: 'Bearer ' + at, + } + var domain = localStorage.getItem('domain_' + acct_id) + } else { + var hdr = { + 'content-type': 'application/json', + } + domain = acct_id + } + if (localStorage.getItem('mode_' + domain) == 'misskey') { + var misskey = true + hdr = { + 'content-type': 'application/json', + } + var url = misskeycom(type, data) + var start = 'https://' + domain + '/api/notes/' + url + var method = 'POST' + var req = {} + if (type != 'noauth') { + req.i = at + } + if (type == 'local-media' || type == 'pub-media') { + req.mediaOnly = true + } + if (type == 'tag') { + req.tag = data + } + if (type == 'list') { + req.listId = data + } + req.untilId = sid + req.limit = 20 + var i = { + method: method, + headers: hdr, + body: JSON.stringify(req), + } + } else { + var misskey = false + var start = + 'https://' + + domain + + '/api/v1/timelines/' + + com(type, data, tlid) + + 'max_id=' + + sid + if (type == 'dm') { + var start = + 'https://' + domain + '/api/v1/conversations?' + 'max_id=' + sid + } + var method = 'GET' + var i = { + method: method, + headers: hdr, + } + } + fetch(start, i) + .then(function(response) { + if (!response.ok) { + response.text().then(function(text) { + setLog(response.url, response.status, text) + }) + } + return response.json() + }) + .catch(function(error) { + todo(error) + setLog(start, 'JSON', error) + console.error(error) + }) + .then(function(json) { + var mute = getFilterTypeByAcct(acct_id, type) + if (misskey) { + var templete = misskeyParse(json, '', acct_id, tlid, '', mute) + } else { + var templete = parse(json, '', acct_id, tlid, '', mute, type) + } + $('#timeline_' + tlid).append(templete) + additional(acct_id, tlid) + jQuery('time.timeago').timeago() + moreloading = false + todc() + }) + } } //TL差分取得 function tlDiff(type, data, acct_id, tlid, delc, voice, mode) { - console.log('Get diff of TL' + tlid) - var multi = localStorage.getItem('column') - var obj = JSON.parse(multi) - var acct_id = obj[tlid].domain - if (!type) { - var type = obj[tlid].type - } else { - var data - } - if (type == 'tag') { - var data = obj[tlid].data - var tag = localStorage.getItem('tag-range') - if (tag == 'local') { - data = data + '&local=true' - } - } else if (type == 'list') { - var data = obj[tlid].data - } - var sid = $('#timeline_' + tlid + ' .cvo') - .first() - .attr('unique-id') - if (sid && !moreloading) { - if ( - type == 'mix' && - localStorage.getItem( - 'mode_' + localStorage.getItem('domain_' + acct_id) - ) != 'misskey' - ) { - return - } else if ( - type == 'plus' && - localStorage.getItem( - 'mode_' + localStorage.getItem('domain_' + acct_id) - ) != 'misskey' - ) { - return - } else if (type == 'notf') { - return - } - moreloading = true - localStorage.setItem('now', type) - todo(cap(type) + ' TL MoreLoading') - if (type != 'noauth') { - var at = localStorage.getItem('acct_' + acct_id + '_at') - var hdr = { - 'content-type': 'application/json', - Authorization: 'Bearer ' + at, - } - var domain = localStorage.getItem('domain_' + acct_id) - } else { - var hdr = { - 'content-type': 'application/json', - } - domain = acct_id - } - if (localStorage.getItem('mode_' + domain) == 'misskey') { - var misskey = true - hdr = { - 'content-type': 'application/json', - } - var url = misskeycom(type, data) - var start = 'https://' + domain + '/api/notes/' + url - var method = 'POST' - var req = {} - if (type != 'noauth') { - req.i = at - } - if (type == 'local-media' || type == 'pub-media') { - req.mediaOnly = true - } - if (type == 'tag') { - req.tag = data - } - if (type == 'list') { - req.listId = data - } - req.sinceId = sid - req.limit = 20 - var i = { - method: method, - headers: hdr, - body: JSON.stringify(req), - } - } else { - var misskey = false - var start = - 'https://' + - domain + - '/api/v1/timelines/' + - com(type, data, tlid) + - 'since_id=' + - sid - if (type == 'dm') { - var start = - 'https://' + domain + '/api/v1/conversations?' + 'since_id=' + sid - } - var method = 'GET' - var i = { - method: method, - headers: hdr, - } - } + console.log('Get diff of TL' + tlid) + var multi = localStorage.getItem('column') + var obj = JSON.parse(multi) + var acct_id = obj[tlid].domain + if (!type) { + var type = obj[tlid].type + } else { + var data + } + if (type == 'tag') { + var data = obj[tlid].data + var tag = localStorage.getItem('tag-range') + if (tag == 'local') { + data = data + '&local=true' + } + } else if (type == 'list') { + var data = obj[tlid].data + } + var sid = $('#timeline_' + tlid + ' .cvo') + .first() + .attr('unique-id') + if (sid && !moreloading) { + if ( + type == 'mix' && + localStorage.getItem( + 'mode_' + localStorage.getItem('domain_' + acct_id) + ) != 'misskey' + ) { + return + } else if ( + type == 'plus' && + localStorage.getItem( + 'mode_' + localStorage.getItem('domain_' + acct_id) + ) != 'misskey' + ) { + return + } else if (type == 'notf') { + return + } + moreloading = true + localStorage.setItem('now', type) + todo(cap(type) + ' TL MoreLoading') + if (type != 'noauth') { + var at = localStorage.getItem('acct_' + acct_id + '_at') + var hdr = { + 'content-type': 'application/json', + Authorization: 'Bearer ' + at, + } + var domain = localStorage.getItem('domain_' + acct_id) + } else { + var hdr = { + 'content-type': 'application/json', + } + domain = acct_id + } + if (localStorage.getItem('mode_' + domain) == 'misskey') { + var misskey = true + hdr = { + 'content-type': 'application/json', + } + var url = misskeycom(type, data) + var start = 'https://' + domain + '/api/notes/' + url + var method = 'POST' + var req = {} + if (type != 'noauth') { + req.i = at + } + if (type == 'local-media' || type == 'pub-media') { + req.mediaOnly = true + } + if (type == 'tag') { + req.tag = data + } + if (type == 'list') { + req.listId = data + } + req.sinceId = sid + req.limit = 20 + var i = { + method: method, + headers: hdr, + body: JSON.stringify(req), + } + } else { + var misskey = false + var start = + 'https://' + + domain + + '/api/v1/timelines/' + + com(type, data, tlid) + + 'since_id=' + + sid + if (type == 'dm') { + var start = + 'https://' + domain + '/api/v1/conversations?' + 'since_id=' + sid + } + var method = 'GET' + var i = { + method: method, + headers: hdr, + } + } - fetch(start, i) - .then(function (response) { - if (!response.ok) { - response.text().then(function (text) { - setLog(response.url, response.status, text) - }) - } - return response.json() - }) - .catch(function (error) { - todo(error) - setLog(start, 'JSON', error) - console.error(error) - }) - .then(function (json) { - console.log(['Result diff of TL' + tlid, json]) - if (misskey) { - var templete = misskeyParse(json, '', acct_id, tlid, '', mute) - } else { - var templete = parse(json, '', acct_id, tlid, '', mute, type) - } - $('#timeline_' + tlid).prepend(templete) - additional(acct_id, tlid) - jQuery('time.timeago').timeago() - moreloading = false - todc() - }) - } + fetch(start, i) + .then(function(response) { + if (!response.ok) { + response.text().then(function(text) { + setLog(response.url, response.status, text) + }) + } + return response.json() + }) + .catch(function(error) { + todo(error) + setLog(start, 'JSON', error) + console.error(error) + }) + .then(function(json) { + console.log(['Result diff of TL' + tlid, json]) + if (misskey) { + var templete = misskeyParse(json, '', acct_id, tlid, '', mute) + } else { + var templete = parse(json, '', acct_id, tlid, '', mute, type) + } + $('#timeline_' + tlid).prepend(templete) + additional(acct_id, tlid) + jQuery('time.timeago').timeago() + moreloading = false + todc() + }) + } } //TL再取得 function reloadTL(type, data, acct_id, key, delc, voice) { - tl(type, data, acct_id, key, delc, voice, '') + tl(type, data, acct_id, key, delc, voice, '') } //WebSocket切断 function tlCloser() { - Object.keys(websocket).forEach(function (tlid) { - if (websocketOld[tlid]) { - websocketOld[tlid].close() - console.log('%c Close Streaming API: Old' + tlid, 'color:blue') - } - if (websocket[0]) { - console.log(websocket[0]) - websocket[tlid].close() - console.log('%c Close Streaming API:' + tlid, 'color:blue') - } - }) - websocket = [] - Object.keys(wsHome).forEach(function (tlid) { - if (wsHome[tlid]) { - wsHome[tlid].close() - console.log('%c Close Streaming API:Integrated Home' + tlid, 'color:blue') - } - }) - wsHome = [] - Object.keys(wsLocal).forEach(function (tlid) { - if (wsLocal[tlid]) { - wsLocal[tlid].close() - console.log( - '%c Close Streaming API:Integrated Local' + tlid, - 'color:blue' - ) - } - }) - wsLocal = [] - Object.keys(websocketNotf).forEach(function (tlid) { - if (websocketNotf[tlid]) { - websocketNotf[tlid].close() - console.log('%c Close Streaming API:Notf' + tlid, 'color:blue') - } - }) - Object.keys(misskeyws).forEach(function (tlid) { - if (misskeyws[tlid]) { - misskeyws[tlid].close() - console.log('%c Close Streaming API:Misskey' + tlid, 'color:blue') - } - }) - misskeyws = {} + Object.keys(websocket).forEach(function(tlid) { + if (websocketOld[tlid]) { + websocketOld[tlid].close() + console.log('%c Close Streaming API: Old' + tlid, 'color:blue') + } + if (websocket[0]) { + console.log(websocket[0]) + websocket[tlid].close() + console.log('%c Close Streaming API:' + tlid, 'color:blue') + } + }) + websocket = [] + Object.keys(wsHome).forEach(function(tlid) { + if (wsHome[tlid]) { + wsHome[tlid].close() + console.log('%c Close Streaming API:Integrated Home' + tlid, 'color:blue') + } + }) + wsHome = [] + Object.keys(wsLocal).forEach(function(tlid) { + if (wsLocal[tlid]) { + wsLocal[tlid].close() + console.log( + '%c Close Streaming API:Integrated Local' + tlid, + 'color:blue' + ) + } + }) + wsLocal = [] + Object.keys(websocketNotf).forEach(function(tlid) { + if (websocketNotf[tlid]) { + websocketNotf[tlid].close() + console.log('%c Close Streaming API:Notf' + tlid, 'color:blue') + } + }) + Object.keys(misskeyws).forEach(function(tlid) { + if (misskeyws[tlid]) { + misskeyws[tlid].close() + console.log('%c Close Streaming API:Misskey' + tlid, 'color:blue') + } + }) + misskeyws = {} } //TLのタイトル function cap(type, data, acct_id) { - //独自ロケール - var locale = localStorage.getItem('locale') - if (locale == 'yes') { - var locale = false - } - if (type == 'home') { - if (localStorage.getItem('home_' + acct_id) && !locale) { - var response = localStorage.getItem('home_' + acct_id) - } else { - var response = 'Home TL' - } - } else if (type == 'local') { - if (localStorage.getItem('local_' + acct_id) && !locale) { - var response = localStorage.getItem('local_' + acct_id) - } else { - var response = 'Local TL' - } - } else if (type == 'local-media') { - if (localStorage.getItem('local_' + acct_id) && !locale) { - var response = - localStorage.getItem('local_' + acct_id) + - '(' + - lang.lang_tl_media + - ')' - } else { - var response = 'Local TL(Media)' - } - } else if (type == 'pub') { - if (localStorage.getItem('public_' + acct_id) && !locale) { - var response = localStorage.getItem('public_' + acct_id) - } else { - var response = 'Federated TL' - } - } else if (type == 'pub-media') { - if (localStorage.getItem('public_' + acct_id) && !locale) { - var response = - localStorage.getItem('public_' + acct_id) + - '(' + - lang.lang_tl_media + - ')' - } else { - var response = 'Federated TL(Media)' - } - } else if (type == 'tag') { - if (data) { - if (data.name) { - var response = '#' + escapeHTML(data.name) - } else { - var response = '#' + escapeHTML(data) - } - } - } else if (type == 'list') { - var ltitle = localStorage.getItem('list_' + data + '_' + acct_id) - var response = 'List(' + ltitle + ')' - } else if (type == 'notf') { - if (localStorage.getItem('notification_' + acct_id) && !locale) { - var response = localStorage.getItem('notification_' + acct_id) - } else { - var response = 'Notification TL' - } - } else if (type == 'noauth') { - var response = 'Glance TL' - } else if (type == 'dm') { - var response = 'DM' - } else if (type == 'mix') { - if ( - localStorage.getItem( - 'mode_' + localStorage.getItem('domain_' + acct_id) - ) == 'misskey' - ) { - var response = 'Social TL' - } else { - var response = 'Integrated' - } - } else if (type == 'plus') { - var response = 'Local+' - } else if (type == 'webview') { - var response = 'Twitter' - } else if (type == 'tootsearch') { - var response = 'tootsearch(' + escapeHTML(data) + ')' - } else if (type == 'bookmark') { - var response = 'Bookmarks' - } else if (type == 'utl') { - var response = 'User TL(' + escapeHTML(data.acct) + ')' - } - return response + //独自ロケール + var locale = localStorage.getItem('locale') + if (locale == 'yes') { + var locale = false + } + if (type == 'home') { + if (localStorage.getItem('home_' + acct_id) && !locale) { + var response = localStorage.getItem('home_' + acct_id) + } else { + var response = 'Home TL' + } + } else if (type == 'local') { + if (localStorage.getItem('local_' + acct_id) && !locale) { + var response = localStorage.getItem('local_' + acct_id) + } else { + var response = 'Local TL' + } + } else if (type == 'local-media') { + if (localStorage.getItem('local_' + acct_id) && !locale) { + var response = + localStorage.getItem('local_' + acct_id) + + '(' + + lang.lang_tl_media + + ')' + } else { + var response = 'Local TL(Media)' + } + } else if (type == 'pub') { + if (localStorage.getItem('public_' + acct_id) && !locale) { + var response = localStorage.getItem('public_' + acct_id) + } else { + var response = 'Federated TL' + } + } else if (type == 'pub-media') { + if (localStorage.getItem('public_' + acct_id) && !locale) { + var response = + localStorage.getItem('public_' + acct_id) + + '(' + + lang.lang_tl_media + + ')' + } else { + var response = 'Federated TL(Media)' + } + } else if (type == 'tag') { + if (data) { + if (data.name) { + var response = '#' + escapeHTML(data.name) + } else { + var response = '#' + escapeHTML(data) + } + } + } else if (type == 'list') { + var ltitle = localStorage.getItem('list_' + data + '_' + acct_id) + var response = 'List(' + ltitle + ')' + } else if (type == 'notf') { + if (localStorage.getItem('notification_' + acct_id) && !locale) { + var response = localStorage.getItem('notification_' + acct_id) + } else { + var response = 'Notification TL' + } + } else if (type == 'noauth') { + var response = 'Glance TL' + } else if (type == 'dm') { + var response = 'DM' + } else if (type == 'mix') { + if ( + localStorage.getItem( + 'mode_' + localStorage.getItem('domain_' + acct_id) + ) == 'misskey' + ) { + var response = 'Social TL' + } else { + var response = 'Integrated' + } + } else if (type == 'plus') { + var response = 'Local+' + } else if (type == 'webview') { + var response = 'Twitter' + } else if (type == 'tootsearch') { + var response = 'tootsearch(' + escapeHTML(data) + ')' + } else if (type == 'bookmark') { + var response = 'Bookmarks' + } else if (type == 'utl') { + var response = 'User TL(' + escapeHTML(data.acct) + ')' + } + return response } //TLのURL function com(type, data, tlid) { - if (type == 'home') { - return 'home?' - } else if (type == 'local' || type == 'noauth') { - return 'public?local=true&' - } else if (type == 'local-media') { - return 'public?local=true&only_media=true&' - } else if (type == 'pub') { - var add = '' - if (remoteOnlyCk(tlid)) { - add = 'remote=true&' - } - return 'public?' + add - } else if (type == 'pub-media') { - var add = '' - if (remoteOnlyCk(tlid)) { - add = 'remote=true&' - } - return 'public?only_media=true&' + add - } else if (type == 'tag') { - if (data.name) { - var name = data.name - var all = data.all - var any = data.any - var none = data.none - } else { - var name = data - var all = '' - var any = '' - var none = '' - } - return `tag/${name}?${buildQuery('all', all)}${buildQuery( + if (type == 'home') { + return 'home?' + } else if (type == 'local' || type == 'noauth') { + return 'public?local=true&' + } else if (type == 'local-media') { + return 'public?local=true&only_media=true&' + } else if (type == 'pub') { + var add = '' + if (remoteOnlyCk(tlid)) { + add = 'remote=true&' + } + return 'public?' + add + } else if (type == 'pub-media') { + var add = '' + if (remoteOnlyCk(tlid)) { + add = 'remote=true&' + } + return 'public?only_media=true&' + add + } else if (type == 'tag') { + if (data.name) { + var name = data.name + var all = data.all + var any = data.any + var none = data.none + } else { + var name = data + var all = '' + var any = '' + var none = '' + } + return `tag/${name}?${buildQuery('all', all)}${buildQuery( 'any', any )}${buildQuery('none', none)}`.slice(0, -1) - } else if (type == 'list') { - return 'list/' + data + '?' - } else if (type == 'dm') { - return 'direct?' - } else if (type == 'bookmark') { - return 'bookmarks?' - } + } else if (type == 'list') { + return 'list/' + data + '?' + } else if (type == 'dm') { + return 'direct?' + } else if (type == 'bookmark') { + return 'bookmarks?' + } } //Misskey function typePs(type) { - if (type == 'home') { - return 'homeTimeline' - } else if (type == 'local' || type == 'noauth') { - return 'localTimeline' - } else if (type == 'local-media') { - return 'localTimeline' - } else if (type == 'pub') { - return 'globalTimeline' - } else if (type == 'mix') { - return 'hybridTimeline' - } else if (type == 'tag') { - return 'hashtag' - } else if (type == 'list') { - return 'userList' - } + if (type == 'home') { + return 'homeTimeline' + } else if (type == 'local' || type == 'noauth') { + return 'localTimeline' + } else if (type == 'local-media') { + return 'localTimeline' + } else if (type == 'pub') { + return 'globalTimeline' + } else if (type == 'mix') { + return 'hybridTimeline' + } else if (type == 'tag') { + return 'hashtag' + } else if (type == 'list') { + return 'userList' + } } + function misskeycom(type, data) { - if (type == 'home') { - return 'timeline' - } else if (type == 'mix') { - return 'hybrid-timeline' - } else if (type == 'local' || type == 'noauth') { - return 'local-timeline' - } else if (type == 'local-media') { - return 'local-timeline' - } else if (type == 'pub') { - return 'global-timeline' - } else if (type == 'pub-media') { - return 'global-timeline' - } else if (type == 'tag') { - return 'search_by_tag' - } else if (type == 'list') { - return 'user-list-timeline' - } + if (type == 'home') { + return 'timeline' + } else if (type == 'mix') { + return 'hybrid-timeline' + } else if (type == 'local' || type == 'noauth') { + return 'local-timeline' + } else if (type == 'local-media') { + return 'local-timeline' + } else if (type == 'pub') { + return 'global-timeline' + } else if (type == 'pub-media') { + return 'global-timeline' + } else if (type == 'tag') { + return 'search_by_tag' + } else if (type == 'list') { + return 'user-list-timeline' + } } //TLのアイコン function icon(type) { - if (type == 'home') { - var response = 'home' - } else if (type == 'local') { - var response = 'people_outline' - } else if (type == 'local-media') { - var response = 'people_outline' - } else if (type == 'pub') { - var response = 'language' - } else if (type == 'pub-media') { - var response = 'language' - } else if (type == 'tag') { - var response = 'whatshot' - } else if (type == 'list') { - var response = 'view_headline' - } else if (type == 'notf') { - var response = 'notifications' - } else if (type == 'noauth') { - var response = 'people_outline' - } else if (type == 'dm') { - var response = 'mail_outline' - } else if (type == 'mix') { - var response = 'merge_type' - } else if (type == 'plus') { - var response = 'merge_type' - } else if (type == 'webview') { - var response = 'language' - } else if (type == 'tootsearch') { - var response = 'search' - } else if (type == 'bookmark') { - var response = 'bookmark' - } - return response + if (type == 'home') { + var response = 'home' + } else if (type == 'local') { + var response = 'people_outline' + } else if (type == 'local-media') { + var response = 'people_outline' + } else if (type == 'pub') { + var response = 'language' + } else if (type == 'pub-media') { + var response = 'language' + } else if (type == 'tag') { + var response = 'whatshot' + } else if (type == 'list') { + var response = 'view_headline' + } else if (type == 'notf') { + var response = 'notifications' + } else if (type == 'noauth') { + var response = 'people_outline' + } else if (type == 'dm') { + var response = 'mail_outline' + } else if (type == 'mix') { + var response = 'merge_type' + } else if (type == 'plus') { + var response = 'merge_type' + } else if (type == 'webview') { + var response = 'language' + } else if (type == 'tootsearch') { + var response = 'search' + } else if (type == 'bookmark') { + var response = 'bookmark' + } + return response } -function reconnector(tlid, type, acct_id, data, mode) { - console.log('%c Reconnector:' + mode + '(timeline' + tlid + ')', 'color:pink') - if (type == 'mix' || type == 'integrated' || type == 'plus') { - if (localStorage.getItem('voice_' + tlid)) { - var voice = true - } else { - var voice = false - } - var mute = getFilterTypeByAcct(acct_id, type) - var wssh = localStorage.getItem('wssH_' + tlid) - wsHome[wssh].close() - var wssl = localStorage.getItem('wssL_' + tlid) - wsLocal[wssl].close() - mixre(acct_id, tlid, type, mute, '', voice, mode) - } else if (type == 'notf') { - notfColumn(acct_id, tlid, '') - } else { - var wss = localStorage.getItem('wss_' + tlid) - websocket[wss].close() - if (localStorage.getItem('voice_' + tlid)) { - var voice = true - } else { - var voice = false - } - var mute = getFilterTypeByAcct(acct_id, type) - var domain = localStorage.getItem('domain_' + acct_id) - } - M.toast({ html: lang.lang_tl_reconnect, displayLength: 2000 }) -} -function columnReload(tlid, type) { - $('#notice_icon_' + tlid).addClass('red-text') - $('#unread_' + tlid + ' .material-icons').removeClass('teal-text') - var multi = localStorage.getItem('column') - var obj = JSON.parse(multi) - var acct_id = obj[tlid].domain - var domain = localStorage.getItem('domain_' + acct_id) - if (mastodonBaseWsStatus[domain] == 'available') { - stremaingSubscribe(type, acct_id, obj[tlid].data, true) - parseColumn(tlid, true) - return true - } - if (type == 'mix' || type == 'integrated' || type == 'plus') { - if (localStorage.getItem('voice_' + tlid)) { - var voice = true - } else { - var voice = false - } - var mute = getFilterTypeByAcct(acct_id, type) - var wssh = localStorage.getItem('wssH_' + tlid) - wsHome[wssh].close() - var wssl = localStorage.getItem('wssL_' + tlid) - wsLocal[wssl].close() - parseColumn(tlid) - } else if (type == 'notf') { - $('#notice_icon_' + tlid).removeClass('red-text') - notfColumn(acct_id, tlid, '') - } else if (type == 'bookmark') { - $('#notice_icon_' + tlid).removeClass('red-text') - getBookmark(acct_id, tlid, false) - } else { - var wss = localStorage.getItem('wss_' + tlid) - websocket[wss].close() - parseColumn(tlid, false) - } +function reconnector(tlid, type, acct_id, data, mode) { + console.log('%c Reconnector:' + mode + '(timeline' + tlid + ')', 'color:pink') + if (type == 'mix' || type == 'integrated' || type == 'plus') { + if (localStorage.getItem('voice_' + tlid)) { + var voice = true + } else { + var voice = false + } + var mute = getFilterTypeByAcct(acct_id, type) + var wssh = localStorage.getItem('wssH_' + tlid) + wsHome[wssh].close() + var wssl = localStorage.getItem('wssL_' + tlid) + wsLocal[wssl].close() + mixre(acct_id, tlid, type, mute, '', voice, mode) + } else if (type == 'notf') { + notfColumn(acct_id, tlid, '') + } else { + var wss = localStorage.getItem('wss_' + tlid) + websocket[wss].close() + if (localStorage.getItem('voice_' + tlid)) { + var voice = true + } else { + var voice = false + } + var mute = getFilterTypeByAcct(acct_id, type) + var domain = localStorage.getItem('domain_' + acct_id) + } + M.toast({ html: lang.lang_tl_reconnect, displayLength: 2000 }) +} + +function columnReload(tlid, type) { + $('#notice_icon_' + tlid).addClass('red-text') + $('#unread_' + tlid + ' .material-icons').removeClass('teal-text') + var multi = localStorage.getItem('column') + var obj = JSON.parse(multi) + var acct_id = obj[tlid].domain + var domain = localStorage.getItem('domain_' + acct_id) + if (mastodonBaseWsStatus[domain] == 'available') { + stremaingSubscribe(type, acct_id, obj[tlid].data, true) + parseColumn(tlid, true) + return true + } + if (type == 'mix' || type == 'integrated' || type == 'plus') { + if (localStorage.getItem('voice_' + tlid)) { + var voice = true + } else { + var voice = false + } + var mute = getFilterTypeByAcct(acct_id, type) + var wssh = localStorage.getItem('wssH_' + tlid) + wsHome[wssh].close() + var wssl = localStorage.getItem('wssL_' + tlid) + wsLocal[wssl].close() + parseColumn(tlid) + } else if (type == 'notf') { + $('#notice_icon_' + tlid).removeClass('red-text') + notfColumn(acct_id, tlid, '') + } else if (type == 'bookmark') { + $('#notice_icon_' + tlid).removeClass('red-text') + getBookmark(acct_id, tlid, false) + } else { + + var wss = localStorage.getItem('wss_' + tlid) + websocket[wss].close() + parseColumn(tlid, false) + } } //Markers function getMarker(tlid, type, acct_id) { - var domain = localStorage.getItem('domain_' + acct_id) - var at = localStorage.getItem('acct_' + acct_id + '_at') - if (type == 'home') { - var add = 'home' - } else if (type == 'notf') { - var add = 'notifications' - } - var start = 'https://' + domain + '/api/v1/markers?timeline=' + add - fetch(start, { - method: 'GET', - headers: { - 'content-type': 'application/json', - Authorization: 'Bearer ' + at, - }, - }) - .then(function (response) { - if (!response.ok) { - response.text().then(function (text) { - setLog(response.url, response.status, text) - }) - } - return response.json() - }) - .catch(function (error) { - $('#unread_' + tlid).attr( - 'title', - lang.lang_layout_unread + ':' + lang.lang_nothing - ) - $('#unread_' + tlid).attr('data-id', '') - return false - }) - .then(function (json) { - if (json) { - if (json[add]) { - json = json[add] - $('#unread_' + tlid).attr( - 'title', - lang.lang_layout_unread + - ':' + - json.updated_at + - ' v' + - json.version - ) - $('#unread_' + tlid).attr('data-id', json.last_read_id) - } else { - $('#unread_' + tlid).attr( - 'title', - lang.lang_layout_unread + ':' + lang.lang_nothing - ) - $('#unread_' + tlid).attr('data-id', '') - } - } else { - $('#unread_' + tlid).attr( - 'title', - lang.lang_layout_unread + ':' + lang.lang_nothing - ) - $('#unread_' + tlid).attr('data-id', '') - } - }) + var domain = localStorage.getItem('domain_' + acct_id) + var at = localStorage.getItem('acct_' + acct_id + '_at') + if (type == 'home') { + var add = 'home' + } else if (type == 'notf') { + var add = 'notifications' + } + var start = 'https://' + domain + '/api/v1/markers?timeline=' + add + fetch(start, { + method: 'GET', + headers: { + 'content-type': 'application/json', + Authorization: 'Bearer ' + at, + }, + }) + .then(function(response) { + if (!response.ok) { + response.text().then(function(text) { + setLog(response.url, response.status, text) + }) + } + return response.json() + }) + .catch(function(error) { + $('#unread_' + tlid).attr( + 'title', + lang.lang_layout_unread + ':' + lang.lang_nothing + ) + $('#unread_' + tlid).attr('data-id', '') + return false + }) + .then(function(json) { + if (json) { + if (json[add]) { + json = json[add] + $('#unread_' + tlid).attr( + 'title', + lang.lang_layout_unread + + ':' + + json.updated_at + + ' v' + + json.version + ) + $('#unread_' + tlid).attr('data-id', json.last_read_id) + } else { + $('#unread_' + tlid).attr( + 'title', + lang.lang_layout_unread + ':' + lang.lang_nothing + ) + $('#unread_' + tlid).attr('data-id', '') + } + } else { + $('#unread_' + tlid).attr( + 'title', + lang.lang_layout_unread + ':' + lang.lang_nothing + ) + $('#unread_' + tlid).attr('data-id', '') + } + }) } + function showUnread(tlid, type, acct_id) { - if ($('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) { - goTop(tlid) - return - } - $('#unread_' + tlid + ' .material-icons').addClass('teal-text') - var domain = localStorage.getItem('domain_' + acct_id) - var at = localStorage.getItem('acct_' + acct_id + '_at') - var id = $('#unread_' + tlid).attr('data-id') - if (type == 'home') { - var add = 'timelines/home?min_id=' + id - } else if (type == 'notf') { - var add = 'notifications?min_id=' + id - } - var start = 'https://' + domain + '/api/v1/' + add - fetch(start, { - method: 'GET', - headers: { - 'content-type': 'application/json', - Authorization: 'Bearer ' + at, - }, - }) - .then(function (response) { - if (!response.ok) { - response.text().then(function (text) { - setLog(response.url, response.status, text) - }) - } - return response.json() - }) - .catch(function (error) { - todo(error) - setLog(start, 'JSON', error) - console.error(error) - }) - .then(function (json) { - if (!json || !json.length) { - columnReload(tlid, type) - } - var mute = getFilterTypeByAcct(acct_id, type) - var templete = parse(json, type, acct_id, tlid, '', mute, type) - var len = json.length - 1 - $('#timeline_' + tlid).html(templete) - if ($('#timeline_' + tlid + ' .cvo:eq(' + len + ')').length) { - var to = $('#timeline_' + tlid + ' .cvo:eq(' + len + ')').offset().top - $('#timeline_box_' + tlid + '_box .tl-box').scrollTop(to) - } - additional(acct_id, tlid) - jQuery('time.timeago').timeago() - todc() - }) + if ($('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) { + goTop(tlid) + return + } + $('#unread_' + tlid + ' .material-icons').addClass('teal-text') + var domain = localStorage.getItem('domain_' + acct_id) + var at = localStorage.getItem('acct_' + acct_id + '_at') + var id = $('#unread_' + tlid).attr('data-id') + if (type == 'home') { + var add = 'timelines/home?min_id=' + id + } else if (type == 'notf') { + var add = 'notifications?min_id=' + id + } + var start = 'https://' + domain + '/api/v1/' + add + fetch(start, { + method: 'GET', + headers: { + 'content-type': 'application/json', + Authorization: 'Bearer ' + at, + }, + }) + .then(function(response) { + if (!response.ok) { + response.text().then(function(text) { + setLog(response.url, response.status, text) + }) + } + return response.json() + }) + .catch(function(error) { + todo(error) + setLog(start, 'JSON', error) + console.error(error) + }) + .then(function(json) { + if (!json || !json.length) { + columnReload(tlid, type) + } + var mute = getFilterTypeByAcct(acct_id, type) + var templete = parse(json, type, acct_id, tlid, '', mute, type) + var len = json.length - 1 + $('#timeline_' + tlid).html(templete) + if ($('#timeline_' + tlid + ' .cvo:eq(' + len + ')').length) { + var to = $('#timeline_' + tlid + ' .cvo:eq(' + len + ')').offset().top + $('#timeline_box_' + tlid + '_box .tl-box').scrollTop(to) + } + additional(acct_id, tlid) + jQuery('time.timeago').timeago() + todc() + }) } var ueloadlock = false -function ueload(tlid) { - if (ueloadlock) { - return false - } - ueloadlock = true - var multi = localStorage.getItem('column') - var obj = JSON.parse(multi) - var acct_id = obj[tlid * 1].domain - var type = obj[tlid * 1].type - var domain = localStorage.getItem('domain_' + acct_id) - var at = localStorage.getItem('acct_' + acct_id + '_at') - var id = $('#timeline_' + tlid + ' .cvo:eq(0)').attr('unique-id') - if (type == 'home') { - var add = 'timelines/home?min_id=' + id - } else if (type == 'notf') { - var add = 'notifications?min_id=' + id - } - var start = 'https://' + domain + '/api/v1/' + add - fetch(start, { - method: 'GET', - headers: { - 'content-type': 'application/json', - Authorization: 'Bearer ' + at, - }, - }) - .then(function (response) { - if (!response.ok) { - response.text().then(function (text) { - setLog(response.url, response.status, text) - }) - } - return response.json() - }) - .catch(function (error) { - todo(error) - setLog(start, 'JSON', error) - console.error(error) - }) - .then(function (json) { - if (!json) { - columnReload(tlid, type) - } - var mute = getFilterTypeByAcct(acct_id, type) - var templete = parse(json, '', acct_id, tlid, '', mute, type) - var len = json.length - 1 - $('#timeline_' + tlid).prepend(templete) - if ($('#timeline_' + tlid + ' .cvo:eq(' + len + ')').length) { - var to = $('#timeline_' + tlid + ' .cvo:eq(' + len + ')').offset().top - $('#timeline_box_' + tlid + '_box .tl-box').scrollTop(to) - } - additional(acct_id, tlid) - jQuery('time.timeago').timeago() - todc() - ueloadlock = false - }) -} -function asRead(callback) { - //Markers - var markers = localStorage.getItem('markers') - if (markers == 'no') { - markers = false - } else { - markers = true - } - if (markers) { - var multi = localStorage.getItem('column') - var obj = JSON.parse(multi) - var obl = obj.length - ct = 0 - for (var i = 0; i < obl; i++) { - var acct_id = obj[i].domain - var type = obj[i].type - if (type == 'home' || type == 'notf') { - if (type == 'home') { - var id = $('#timeline_' + i + ' .cvo:eq(0)').attr('unique-id') - var poster = { - home: { - last_read_id: id, - }, - } - } else { - var id = $('#timeline_' + i + ' .cvo:eq(0)').attr('data-notf') - var poster = { - notifications: { - last_read_id: id, - }, - } - } - var domain = localStorage.getItem('domain_' + acct_id) - var at = localStorage.getItem('acct_' + acct_id + '_at') - var httpreq = new XMLHttpRequest() - var start = 'https://' + domain + '/api/v1/markers' - httpreq.open('POST', start, true) - httpreq.setRequestHeader('Content-Type', 'application/json') - httpreq.setRequestHeader('Authorization', 'Bearer ' + at) - httpreq.responseType = 'json' - httpreq.send(JSON.stringify(poster)) - httpreq.onreadystatechange = function () { - if (httpreq.readyState === 4) { - var json = httpreq.response - if (this.status !== 200) { - setLog(start, this.status, this.response) - } - console.log(json) - ct++ - if (ct == obl && callback) { - postMessage(['asReadComp', ''], '*') - } - } - } - } - } - } +function ueload(tlid) { + if (ueloadlock) { + return false + } + ueloadlock = true + var multi = localStorage.getItem('column') + var obj = JSON.parse(multi) + var acct_id = obj[tlid * 1].domain + var type = obj[tlid * 1].type + var domain = localStorage.getItem('domain_' + acct_id) + var at = localStorage.getItem('acct_' + acct_id + '_at') + var id = $('#timeline_' + tlid + ' .cvo:eq(0)').attr('unique-id') + if (type == 'home') { + var add = 'timelines/home?min_id=' + id + } else if (type == 'notf') { + var add = 'notifications?min_id=' + id + } + var start = 'https://' + domain + '/api/v1/' + add + fetch(start, { + method: 'GET', + headers: { + 'content-type': 'application/json', + Authorization: 'Bearer ' + at, + }, + }) + .then(function(response) { + if (!response.ok) { + response.text().then(function(text) { + setLog(response.url, response.status, text) + }) + } + return response.json() + }) + .catch(function(error) { + todo(error) + setLog(start, 'JSON', error) + console.error(error) + }) + .then(function(json) { + if (!json) { + columnReload(tlid, type) + } + var mute = getFilterTypeByAcct(acct_id, type) + var templete = parse(json, '', acct_id, tlid, '', mute, type) + var len = json.length - 1 + $('#timeline_' + tlid).prepend(templete) + if ($('#timeline_' + tlid + ' .cvo:eq(' + len + ')').length) { + var to = $('#timeline_' + tlid + ' .cvo:eq(' + len + ')').offset().top + $('#timeline_box_' + tlid + '_box .tl-box').scrollTop(to) + } + additional(acct_id, tlid) + jQuery('time.timeago').timeago() + todc() + ueloadlock = false + }) } + +function asRead(callback) { + //Markers + var markers = localStorage.getItem('markers') + if (markers == 'no') { + markers = false + } else { + markers = true + } + if (markers) { + var multi = localStorage.getItem('column') + var obj = JSON.parse(multi) + var obl = obj.length + ct = 0 + for (var i = 0; i < obl; i++) { + var acct_id = obj[i].domain + var type = obj[i].type + if (type == 'home' || type == 'notf') { + if (type == 'home') { + var id = $('#timeline_' + i + ' .cvo:eq(0)').attr('unique-id') + var poster = { + home: { + last_read_id: id, + }, + } + } else { + var id = $('#timeline_' + i + ' .cvo:eq(0)').attr('data-notf') + var poster = { + notifications: { + last_read_id: id, + }, + } + } + + var domain = localStorage.getItem('domain_' + acct_id) + var at = localStorage.getItem('acct_' + acct_id + '_at') + var httpreq = new XMLHttpRequest() + var start = 'https://' + domain + '/api/v1/markers' + httpreq.open('POST', start, true) + httpreq.setRequestHeader('Content-Type', 'application/json') + httpreq.setRequestHeader('Authorization', 'Bearer ' + at) + httpreq.responseType = 'json' + httpreq.send(JSON.stringify(poster)) + httpreq.onreadystatechange = function() { + if (httpreq.readyState === 4) { + var json = httpreq.response + if (this.status !== 200) { + setLog(start, this.status, this.response) + } + console.log(json) + ct++ + if (ct == obl && callback) { + postMessage(['asReadComp', ''], '*') + } + } + } + } + } + } +} + function asReadEnd() { - //Markers - var markers = localStorage.getItem('markers') - if (markers == 'no') { - markers = false - } else { - markers = true - } - if (markers) { - asRead(true) - Swal.fire({ - title: lang.lang_tl_postmarkers_title, - html: lang.lang_tl_postmarkers, - showConfirmButton: false, - timer: 3000, - onBeforeOpen: () => { - Swal.showLoading() - }, - onClose: () => { }, - }).then((result) => { }) - } else { - postMessage(['asReadComp', ''], '*') - } + //Markers + var markers = localStorage.getItem('markers') + if (markers == 'no') { + markers = false + } else { + markers = true + } + if (markers) { + asRead(true) + Swal.fire({ + title: lang.lang_tl_postmarkers_title, + html: lang.lang_tl_postmarkers, + showConfirmButton: false, + timer: 3000, + onBeforeOpen: () => { + Swal.showLoading() + }, + onClose: () => {}, + }).then((result) => {}) + } else { + postMessage(['asReadComp', ''], '*') + } } //ブックマーク function getBookmark(acct_id, tlid, more) { - moreloading = true - console.log(acct_id, tlid, more) - if (more) { - var sid = $('#timeline_' + tlid + ' .notif-marker') - .last() - .attr('data-maxid') - var ad = '?max_id=' + sid - } else { - var ad = '' - } - var at = localStorage.getItem('acct_' + acct_id + '_at') - var domain = localStorage.getItem('domain_' + acct_id) - var start = 'https://' + domain + '/api/v1/bookmarks' + ad - var httpreq = new XMLHttpRequest() - httpreq.open('GET', start, true) - httpreq.setRequestHeader('Content-Type', 'application/json') - httpreq.setRequestHeader('Authorization', 'Bearer ' + at) - httpreq.responseType = 'json' - httpreq.send() - httpreq.onreadystatechange = function () { - if (httpreq.readyState === 4) { - var json = httpreq.response - if (this.status !== 200) { - setLog(start, this.status, this.response) - } - var max_ids = httpreq.getResponseHeader('link') - var max_id = 0 - if (max_ids) { - max_ids = max_ids.match(/[?&]{1}max_id=([0-9]+)/) - if (max_ids) { - max_id = max_ids[1] - } - } - var templete = parse(json, 'bookmark', acct_id, tlid, -1, null) - templete = - templete + - '
' - if (more) { - $('#timeline_' + tlid).append(templete) - } else { - $('#timeline_' + tlid).html(templete) - } - $('#landing_' + tlid).hide() - jQuery('time.timeago').timeago() - moreloading = false - todc() - } - } + moreloading = true + console.log(acct_id, tlid, more) + if (more) { + var sid = $('#timeline_' + tlid + ' .notif-marker') + .last() + .attr('data-maxid') + var ad = '?max_id=' + sid + } else { + var ad = '' + } + var at = localStorage.getItem('acct_' + acct_id + '_at') + var domain = localStorage.getItem('domain_' + acct_id) + var start = 'https://' + domain + '/api/v1/bookmarks' + ad + var httpreq = new XMLHttpRequest() + httpreq.open('GET', start, true) + httpreq.setRequestHeader('Content-Type', 'application/json') + httpreq.setRequestHeader('Authorization', 'Bearer ' + at) + httpreq.responseType = 'json' + httpreq.send() + httpreq.onreadystatechange = function() { + if (httpreq.readyState === 4) { + var json = httpreq.response + if (this.status !== 200) { + setLog(start, this.status, this.response) + } + var max_ids = httpreq.getResponseHeader('link') + var max_id = 0 + if (max_ids) { + max_ids = max_ids.match(/[?&]{1}max_id=([0-9]+)/) + if (max_ids) { + max_id = max_ids[1] + } + } + var templete = parse(json, 'bookmark', acct_id, tlid, -1, null) + templete = + templete + + '
' + if (more) { + $('#timeline_' + tlid).append(templete) + } else { + $('#timeline_' + tlid).html(templete) + } + $('#landing_' + tlid).hide() + jQuery('time.timeago').timeago() + moreloading = false + todc() + } + } } + function getUtl(acct_id, tlid, data, more) { - moreloading = true - if (more) { - var sid = $('#timeline_' + tlid + ' .cvo') - .last() - .attr('unique-id') - var ad = '?max_id=' + sid - } else { - var ad = '' - } - var at = localStorage.getItem('acct_' + acct_id + '_at') - var domain = localStorage.getItem('domain_' + acct_id) - var start = "https://" + domain + "/api/v1/accounts/" + data.id + "/statuses" + ad - var httpreq = new XMLHttpRequest() - httpreq.open('GET', start, true) - httpreq.setRequestHeader('Content-Type', 'application/json') - httpreq.setRequestHeader('Authorization', 'Bearer ' + at) - httpreq.responseType = 'json' - httpreq.send() - httpreq.onreadystatechange = function () { - if (httpreq.readyState === 4) { - var json = httpreq.response - if (this.status !== 200) { - setLog(start, this.status, this.response) - } - var templete = parse(json, 'bookmark', acct_id, tlid, -1, null) - templete = - templete - if (more) { - $('#timeline_' + tlid).append(templete) - } else { - $('#timeline_' + tlid).html(templete) - } - $('#landing_' + tlid).hide() - jQuery('time.timeago').timeago() - moreloading = false - todc() - } - } + moreloading = true + if (more) { + var sid = $('#timeline_' + tlid + ' .cvo') + .last() + .attr('unique-id') + var ad = '?max_id=' + sid + } else { + var ad = '' + } + var at = localStorage.getItem('acct_' + acct_id + '_at') + var domain = localStorage.getItem('domain_' + acct_id) + var start = "https://" + domain + "/api/v1/accounts/" + data.id + "/statuses" + ad + var httpreq = new XMLHttpRequest() + httpreq.open('GET', start, true) + httpreq.setRequestHeader('Content-Type', 'application/json') + httpreq.setRequestHeader('Authorization', 'Bearer ' + at) + httpreq.responseType = 'json' + httpreq.send() + httpreq.onreadystatechange = function() { + if (httpreq.readyState === 4) { + var json = httpreq.response + if (this.status !== 200) { + setLog(start, this.status, this.response) + } + var templete = parse(json, 'bookmark', acct_id, tlid, -1, null) + templete = + templete + if (more) { + $('#timeline_' + tlid).append(templete) + } else { + $('#timeline_' + tlid).html(templete) + } + $('#landing_' + tlid).hide() + jQuery('time.timeago').timeago() + moreloading = false + todc() + } + } } //Announcement function announ(acct_id, tlid) { - var at = localStorage.getItem('acct_' + acct_id + '_at') - var domain = localStorage.getItem('domain_' + acct_id) - var start = 'https://' + domain + '/api/v1/announcements' - var httpreq = new XMLHttpRequest() - httpreq.open('GET', start, true) - httpreq.setRequestHeader('Content-Type', 'application/json') - httpreq.setRequestHeader('Authorization', 'Bearer ' + at) - httpreq.responseType = 'json' - httpreq.send() - httpreq.onreadystatechange = function () { - if (httpreq.readyState === 4) { - var json = httpreq.response - if (this.status !== 200) { - setLog(start, this.status, this.response) - } - if (json.length > 0) { - $('.notf-announ_' + acct_id).removeClass('hide') - var ct = 0 - for (var i = 0; i < json.length; i++) { - if (localStorage.getItem('announ_' + acct_id) == json[i].id) { - break - } - ct++ - } - if (ct > 0) { - $('.notf-announ_' + acct_id + '_ct').text(ct) - } - - localStorage.setItem('announ_' + acct_id, json[0].id) - } else { - $('.notf-announ_' + acct_id).addClass('hide') - } - var templete = announParse(json, acct_id, tlid) - $('.announce_' + acct_id).html(templete) - jQuery('time.timeago').timeago() - todc() - } - } + var at = localStorage.getItem('acct_' + acct_id + '_at') + var domain = localStorage.getItem('domain_' + acct_id) + var start = 'https://' + domain + '/api/v1/announcements' + var httpreq = new XMLHttpRequest() + httpreq.open('GET', start, true) + httpreq.setRequestHeader('Content-Type', 'application/json') + httpreq.setRequestHeader('Authorization', 'Bearer ' + at) + httpreq.responseType = 'json' + httpreq.send() + httpreq.onreadystatechange = function() { + if (httpreq.readyState === 4) { + var json = httpreq.response + if (this.status !== 200) { + setLog(start, this.status, this.response) + } + if (json.length > 0) { + $('.notf-announ_' + acct_id).removeClass('hide') + var ct = 0 + for (var i = 0; i < json.length; i++) { + if (localStorage.getItem('announ_' + acct_id) == json[i].id) { + break + } + ct++ + } + if (ct > 0) { + $('.notf-announ_' + acct_id + '_ct').text(ct) + } + + localStorage.setItem('announ_' + acct_id, json[0].id) + } else { + $('.notf-announ_' + acct_id).addClass('hide') + } + var templete = announParse(json, acct_id, tlid) + $('.announce_' + acct_id).html(templete) + jQuery('time.timeago').timeago() + todc() + } + } } //buildQuery function buildQuery(name, data) { - if (!data || data == '') return '' - var arr = data.split(',') - var str = '' - for (var i = 0; i < arr.length; i++) { - str = str + `${name}[]=${arr[i]}&` - } - return str -} + if (!data || data == '') return '' + var arr = data.split(',') + var str = '' + for (var i = 0; i < arr.length; i++) { + str = str + `${name}[]=${arr[i]}&` + } + return str +} \ No newline at end of file diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index beb3cf9e..71f6c629 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -2,1307 +2,1118 @@ - - - - - - - - - - - - - - @@comment-start@@ - - - @@comment-end@@ @@pwa@@ @@store@@ + + + + + + + + + + + + + @@comment-start@@ + + + @@comment-end@@ @@pwa@@ @@store@@ - - - -
-
-
@@webSrc@@
-
@@tsSrc@@
-
@@copy@@
-
@@toot@@
-
-
- - - - Feature -
-
- @@nowOffline@@ -
-
- @@reOnline@@ -
-
- - -
-
-

@@demoBottomBtns@@

- @@lookAtBottom@@ - -
- account_circle: @@acctMan@@
- @@acctManDesc@@ -
- settings: @@setting@@
- @@settingDesc@@ -
- remove_from_queue: TheDesk Nano @@nanoDes@@
- @@nanoDescPlus@@ -
- apps: @@menu@@
- @@menuDesc@@
-
- -
-
- -
-
- @@draghere@@ -
- -
-
-
-
-
- @@post-new@@Reaction -
- -
-
-
- - - -
-
- -
- - cancel - - -
-
-
- format_bold - format_italic - format_underlined - strikethrough_s - format_quote - short_text - code - format_list_bulleted - format_list_numbered - - - autorenew - flare - swap_vert - swap_horiz - - Markdownエディタを隠す + + + +
+
+
@@webSrc@@
+
@@tsSrc@@
+
@@copy@@
+
@@toot@@
+
+
+ + + + Feature +
+
@@nowOffline@@
+
@@reOnline@@
+
+ + +
+
+

@@demoBottomBtns@@

+ @@lookAtBottom@@ + +
+ account_circle: @@acctMan@@
@@acctManDesc@@ +
+ settings: @@setting@@
@@settingDesc@@ +
+ remove_from_queue: TheDesk Nano @@nanoDes@@
@@nanoDescPlus@@ +
+ apps: @@menu@@
@@menuDesc@@ +
+
+ +
+
+ +
+
+ @@draghere@@ +
+ +
+
+
+
+
@@post-new@@Reaction
+ +
+
+
+ + + +
+
+ +
+ + cancel + + +
+
+
+ format_bold + format_italic + format_underlined + strikethrough_s + format_quote + short_text + code + format_list_bulleted + format_list_numbered + + + autorenew + flare + swap_vert + swap_horiz + + Markdownエディタを隠す + +
+ format_size + px + color_lens + +
+ link +   + +
+ image +   + +
+
+
+
+ + Edit -
- format_size - px - color_lens - -
- link -   - -
- image -   - -
-
-
-
- - Edit - -
-
- +
+
+ -
- -
- - Preview - - - Markdownエディタを表示 - -
-
- visibility_off - public - CW - photo_library - tag_faces - more_vert - clear -
-
-
-
- @@replyMode@@: @@no@@/@@temp@@: - @@nothing@@ - @@stamp@@: Off - /@@poll@@:@@no@@ - public - -
- -
- @@postat@@
@@scheduleWarn@@Expire - mode(beta)
- -
-
-
- - - - - - - - - - -
-
- - -
-
-
-
- -
- @@emojiWarn@@ - @@refreshEmoji@@ -
- -
-
-
+
+ visibility_off + public + CW + photo_library + tag_faces + more_vert + clear +
+
+
+
+ @@replyMode@@: @@no@@/@@temp@@: + @@nothing@@ + @@stamp@@: Off /@@poll@@: + @@no@@ + public + +
+ +
+ @@postat@@
@@scheduleWarn@@Expire mode(beta)
+ +
+
+
+ + + + + + + + + + +
+
+ + - / - -
+
+
+
+ +
+ @@emojiWarn@@ + @@refreshEmoji@@ +
+ +
+
+ + / + + +
+ +
+ +
+
+ + + + + + + @@days@@ + @@hours@@ + @@mins@@ +
+
+
+
+ + -
- - - - + + - -
- -
-
-
ご支援いただけませんか？
- (これは支援の有無に関わらず定期的に出ます。過去のバージョン等で何度も表示される等のバグを確認しております。)
- あなたのMastodon, Misskeyライフを邪魔してしまって申し訳ありません。
- 乞食のようなマネをしてご支援をお願いするのもどうかと思いますが、少々お時間をください。
-
- TheDeskになぜ金銭が発生するかについて: - 詳細は省きますが、開発者から緊急の連絡をしたりするのに使われます。
- 全てのユーザーが安心してTheDeskを使っていただける環境のためにも、ぜひご支援をご検討ください。ご支援いただけなくても使用不可能になることは全くありません。
- @@TheDeskDes@@ -
-
-
Support me
- It may disturb your Mastodon life, but your support is required to keep TheDesk awesome!
- @@TheDeskDes@@ -
- -
-
@@once@@
- - @@AWLSupport@@ - -
- @@SendAmazonGift1@@web-pro@cutls.com@@SendAmazonGift2@@
- Kyash
-
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + close + +
+
+ + + + + +
+ chevron_right + expand_less + close +
+
+ + +
+ +
+
+ + +
+
+
+ + + +
+
+
ご支援いただけませんか？
+ (これは支援の有無に関わらず定期的に出ます。過去のバージョン等で何度も表示される等のバグを確認しております。)
あなたのMastodon, Misskeyライフを邪魔してしまって申し訳ありません。
乞食のようなマネをしてご支援をお願いするのもどうかと思いますが、少々お時間をください。 +
+
TheDeskになぜ金銭が発生するかについて: 詳細は省きますが、開発者から緊急の連絡をしたりするのに使われます。 +
+ 全てのユーザーが安心してTheDeskを使っていただける環境のためにも、ぜひご支援をご検討ください。ご支援いただけなくても使用不可能になることは全くありません。
+ @@TheDeskDes@@ +
+
+
Support me
+ It may disturb your Mastodon life, but your support is required to keep TheDesk awesome!
+ @@TheDeskDes@@ +
+ +
+
@@once@@
+ @@AWLSupport@@ +
@@SendAmazonGift1@@ web-pro@cutls.com@@SendAmazonGift2@@
Kyash +
+
+
+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/view/make/language/en/index.json b/app/view/make/language/en/index.json index 738deca6..cb5e6326 100644 --- a/app/view/make/language/en/index.json +++ b/app/view/make/language/en/index.json @@ -1,184 +1,185 @@ { - "draghere":"Drag here to upload", - "nowOffline":"OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet", - "reOnline":"Now we are in the Internet, you should reload...", - "close":"Close", + "draghere": "Drag here to upload", + "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet", + "reOnline": "Now we are in the Internet, you should reload...", + "close": "Close", "webSrc": "Search on Web", "tsSrc": "Search on tootsearch", - "showSelectProf":"Show profile of the selecting account", - "closethisbox":"Close this box", - "toot":"Toot", - "post-new":"Post new", - "nsfwDes":"Mark media as sensitive", - "cwDes":"Hide text behind warning", - "selfile":"Attach..", - "insertEmoji":"Emojis", - "schedule":"Scheduled toot", - "postat":"Post at", - "scheduleWarn":"2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)", - "clearToot":"Clear toot box", - "replyMode":"Reply", - "no":"No", - "yes":"Yes", - "temp":"Attaching files", - "nothing":"None", + "showSelectProf": "Show profile of the selecting account", + "closethisbox": "Close this box", + "toot": "Toot", + "post-new": "Post new", + "nsfwDes": "Mark media as sensitive", + "cwDes": "Hide text behind warning", + "selfile": "Attach..", + "insertEmoji": "Emojis", + "schedule": "Scheduled toot", + "postat": "Post at", + "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)", + "clearToot": "Clear toot box", + "replyMode": "Reply", + "no": "No", + "yes": "Yes", + "temp": "Attaching files", + "nothing": "None", "stamp": "Stamp", "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image", - "vis":"Adjust status privacy", - "cwtext":"Warning text", - "selectVis":"Adjust status privacy", - "publicJP":"", - "unlistedJP":"", - "privateJP":"", - "localJP":"Local only", - "sectoot":"Secondary Toot", - "directJP":"", - "emojiWarn":"", - "emojiInsertWarn":"Some emojis are not able to be inserted.", - "refreshEmoji":"Refresh emojis list", - "closeThisBox":"Close this box", - "showThisEmoji":" are shown.", - "customEmoji":"Custom emojis", - "peopleEmoji":"Emojis of people", - "natureEmoji":"Emojis of nature", - "foodEmoji":"Emojis of foods", - "activityEmoji":"Emojis of activities", - "placeEmoji":"Emojis of places", - "thingsEmoji":"Emojis of tools", - "symbolEmoji":"Emojis of symbols", - "flagsEmoji":"Emojis of flags", + "vis": "Adjust status privacy", + "cwtext": "Warning text", + "selectVis": "Adjust status privacy", + "publicJP": "", + "unlistedJP": "", + "privateJP": "", + "localJP": "Local only", + "sectoot": "Secondary Toot", + "directJP": "", + "emojiWarn": "", + "emojiInsertWarn": "Some emojis are not able to be inserted.", + "refreshEmoji": "Refresh emojis list", + "closeThisBox": "Close this box", + "showThisEmoji": " are shown.", + "customEmoji": "Custom emojis", + "peopleEmoji": "Emojis of people", + "natureEmoji": "Emojis of nature", + "foodEmoji": "Emojis of foods", + "activityEmoji": "Emojis of activities", + "placeEmoji": "Emojis of places", + "thingsEmoji": "Emojis of tools", + "symbolEmoji": "Emojis of symbols", + "flagsEmoji": "Emojis of flags", "draft": "Draft", - "poll":"Poll", - "pollDdisabled":"Polls: Disabled", - "pollProvider":"Provider of Poll", - "polluntil":"Hide 'votes' count until people vote it.", - "choice":"Choice", - "pollmulti":"Multiple select", - "expires_in":"Expires in...(sec)", - "contextBefore":"Context before this toot", - "thisToot":"This toot", - "contextAfter":"Context after this toot", - "beforeLTL":"Local TL before this toot", - "beforeUTL":"User TL before this toot", - "afterLTL":"Local TL after this toot)", - "afterUTL":"User TL before this toot", - "afterFTL":"Federated TL after this toot", - "favedPeople":"People who favourited it", - "btedPeople":"People who boosted it", - "useOtherAcct1":"Use other account", - "useOtherAcct2":":unfav and unBT are disabled.", + "poll": "Poll", + "pollDdisabled": "Polls: Disabled", + "pollProvider": "Provider of Poll", + "polluntil": "Hide 'votes' count until people vote it.", + "choice": "Choice", + "pollmulti": "Multiple select", + "expires_in": "Expires in...(sec)", + "contextBefore": "Context before this toot", + "thisToot": "This toot", + "contextAfter": "Context after this toot", + "beforeLTL": "Local TL before this toot", + "beforeUTL": "User TL before this toot", + "afterLTL": "Local TL after this toot)", + "afterUTL": "User TL before this toot", + "afterFTL": "Federated TL after this toot", + "favedPeople": "People who favourited it", + "btedPeople": "People who boosted it", + "useOtherAcct1": "Use other account", + "useOtherAcct2": ":unfav and unBT are disabled.", "btWithVis": "Boost with visibility", - "reply":"Reply", - "bt":"Boost", - "favRegist":"Favourite", - "openBrowser":"Open in browser", - "screenshot":"Take a screenshot", - "copyURL":"Copy the URL", - "copy":"Copy", - "embed":"Embed", - "toots":"Toots", - "follow":"Follow", - "follower":"Follower", - "utlColumn":"Show as a column", - "timeline":"Timeline", - "operateOtherAcct":"Cross-account", - "list":"List", - "makeNew":"Save", - "blocks":"Blocks", - "mutes":"Mutes", - "block":"Block", - "mute":"Mute", - "domainBlock":"Domain block", - "editProf":"Edit profile", - "change":"Save", - "followReq":"Follow requests", - "likeHimOrHer":"Resembling", - "endorse":"Feature on profile", - "openinbrowser":"Open in browser", - "mainacct":"Set it an main account", - "frc":"Suggest", - "more":"More", - "revoverJP":" to ", - "warnUseOtherAcct":"(Unable to unfollow)", - "revoverJPde":"", - "or":"or", - "openProf":"Show profile", - "warnListRegist":"Follow to add this user to lists.", - "blockDomain":"Add blocking domain", - "name":"Display name", - "note":"Note", - "editProfImg":"Change avataor", - "editHeader":"Change header image", - "blocked":"You are blocked. Why?", - "likeUserDes":"Get people resembling this user.", - "get":"Get", - "historyBack":"Back", - "empUser":"Emphasize this user", - "supportme":"Support TheDesk!", - "TheDeskDes":"TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!", - "PatreonSupport":"Support on Patreon", - "PixivSupport":"Support on Pixiv FANBOX", - "AWLSupport":"Amazon Wish List", - "SendAmazonGift1":"Give me Amazon Gift Card:", - "SendAmazonGift2":"", - "monthly":"Monthly", - "once":"Once", - "local":"Local", - "localMedia":"Local(Media)", - "home":"Home", - "fed":"Federated", - "fedMedia":"Federated(Media)", - "dm":"Direct Message", - "integratedTLDes":"Integrated(Local/Home)", - "localPlusDes":"LTL+Reply+BT", - "notf":"Notifications", + "reply": "Reply", + "bt": "Boost", + "favRegist": "Favourite", + "openBrowser": "Open in browser", + "screenshot": "Take a screenshot", + "copyURL": "Copy the URL", + "copy": "Copy", + "embed": "Embed", + "toots": "Toots", + "follow": "Follow", + "follower": "Follower", + "utlColumn": "Show as a column", + "timeline": "Timeline", + "operateOtherAcct": "Cross-account", + "list": "List", + "makeNew": "Save", + "blocks": "Blocks", + "mutes": "Mutes", + "block": "Block", + "mute": "Mute", + "domainBlock": "Domain block", + "editProf": "Edit profile", + "change": "Save", + "followReq": "Follow requests", + "likeHimOrHer": "Resembling", + "endorse": "Feature on profile", + "openinbrowser": "Open in browser", + "mainacct": "Set it an main account", + "frc": "Suggest", + "more": "More", + "revoverJP": " to ", + "warnUseOtherAcct": "(Unable to unfollow)", + "revoverJPde": "", + "or": "or", + "openProf": "Show profile", + "warnListRegist": "Follow to add this user to lists.", + "blockDomain": "Add blocking domain", + "name": "Display name", + "note": "Note", + "editProfImg": "Change avataor", + "editHeader": "Change header image", + "blocked": "You are blocked. Why?", + "likeUserDes": "Get people resembling this user.", + "get": "Get", + "historyBack": "Back", + "empUser": "Emphasize this user", + "supportme": "Support TheDesk!", + "TheDeskDes": "TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!", + "PatreonSupport": "Support on Patreon", + "PixivSupport": "Support on Pixiv FANBOX", + "AWLSupport": "Amazon Wish List", + "SendAmazonGift1": "Give me Amazon Gift Card:", + "SendAmazonGift2": "", + "monthly": "Monthly", + "once": "Once", + "local": "Local", + "localMedia": "Local(Media)", + "home": "Home", + "fed": "Federated", + "fedMedia": "Federated(Media)", + "dm": "Direct Message", + "integratedTLDes": "Integrated(Local/Home)", + "localPlusDes": "LTL+Reply+BT", + "notf": "Notifications", "bookmark": "Bookmarks", - "showThisTL":"Show this TL:", - "webviewWarn":"TweetDeck with customed TJDeck(Code/TJDeck).", - "add":"Add", - "search":"Search", - "sortSet":"Sort", - "selectAcct":"Account(Scroll to show all)", - "listLocale":"List", - "filterWord":"Filtering words", - "degree":"Filter contexts", - "conver":"Conversations", - "prof":"Profiles", - "option":"Options", - "matchWord":"Whole word", - "warnMatchWord":"Nice for Latin language", - "except":"Drop instead of hide", - "exceptWorn":"Filtered toots will disappear irreversibly, even if filter is later removed", - "avalableBefore":"Expire after", - "warnAvBefore":"Unset or \"0\" means \"Never\"", - "warnAvBefore2":"This value may contain some error", - "unlimited":"Never", - "days":"day(s)", - "hours":"hour(s)", - "mins":"minute(s)", - "secs":"second(s)", - "warnOnIntegratedTL":"Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.", - "helloTheDesk":"Internal error: please clear all data(at setting page) All data will be deleted.", - "addColumn":"Add a column", - "sortColumns":"Sort", - "acctMan":"Account Manager", - "filter":"Filter", - "setting":"Preferences", - "reverse":"Toot button layout reverse", - "f5":"Reload TL", - "nanoDes":"The smallest Mastodon,", - "verTips":"Version", - "clockTips":"Clock", - "ramTips":"RAM status", - "changeTips":"Change Tips", - "helpAndLogs":"Help & Log", - "help":"Help", - "contactwithlog":"If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.", - "about":"About TheDesk", - "hereAddColumns":"<- Add TL", + "showThisTL": "Show this TL:", + "webviewWarn": "TweetDeck with customed TJDeck(Code/TJDeck).", + "add": "Add", + "search": "Search", + "sortSet": "Sort", + "selectAcct": "Account(Scroll to show all)", + "listLocale": "List", + "filterWord": "Filtering words", + "degree": "Filter contexts", + "conver": "Conversations", + "prof": "Profiles", + "option": "Options", + "matchWord": "Whole word", + "warnMatchWord": "Nice for Latin language", + "except": "Drop instead of hide", + "exceptWorn": "Filtered toots will disappear irreversibly, even if filter is later removed", + "avalableBefore": "Expire after", + "warnAvBefore": "Unset or \"0\" means \"Never\"", + "warnAvBefore2": "This value may contain some error", + "unlimited": "Never", + "days": "day(s)", + "hours": "hour(s)", + "mins": "minute(s)", + "secs": "second(s)", + "warnOnIntegratedTL": "Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.", + "helloTheDesk": "Internal error: please clear all data(at setting page) All data will be deleted.", + "addColumn": "Add a column", + "sortColumns": "Sort", + "acctMan": "Account Manager", + "filter": "Filter", + "setting": "Preferences", + "reverse": "Toot button layout reverse", + "f5": "Reload TL", + "nanoDes": "The smallest Mastodon,", + "verTips": "Version", + "clockTips": "Clock", + "ramTips": "RAM status", + "changeTips": "Change Tips", + "helpAndLogs": "Help & Log", + "help": "Help", + "contactwithlog": "If you tell me bugs(not working or something) with this log, I can detect what is wrong more easily.", + "about": "About TheDesk", + "hereAddColumns": "<- Add TL", "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/ja-KS/index.json b/app/view/make/language/ja-KS/index.json index 38b9c509..0749a859 100644 --- a/app/view/make/language/ja-KS/index.json +++ b/app/view/make/language/ja-KS/index.json @@ -1,182 +1,183 @@ { - "draghere":"ドラッグしてみ？(ドラッグしたらすぐアップロードされるで)", - "nowOffline":"オフラインやで。投稿は全部下書きに行くし、もしオンラインなったら再読み込みしたらええで。", - "reOnline":"オンライン戻ったから再読み込みしてな。", - "close":"Close", + "draghere": "ドラッグしてみ？(ドラッグしたらすぐアップロードされるで)", + "nowOffline": "オフラインやで。投稿は全部下書きに行くし、もしオンラインなったら再読み込みしたらええで。", + "reOnline": "オンライン戻ったから再読み込みしてな。", + "close": "Close", "webSrc": "Webでさがす", "tsSrc": "tootsearchでさがす", - "showSelectProf":"このアカウントのプロフィール出す", - "closethisbox":"このボックスなおす", - "post-new":"投稿", - "toot":"トゥート", - "nsfwDes":"画像を見たらあかんやつにする", - "cwDes":"コンテンツワーニング(ほんまに見るんか？って聞く)", - "selfile":"ファイル選ぶ", - "insertEmoji":"絵文字入れる", - "schedule":"時間指定投稿", - "postat":"時間指定投稿", - "scheduleWarn":"2.7.0~ 5分は待ってな。サーバーの時計おうてるかは知らんで。", - "clearToot":"トゥートボックスのクリア", - "replyMode":"返信モード", - "no":"いいえ", - "yes":"はい", - "temp":"添付ファイル", - "nothing":"なし", - "vis":"公開範囲", - "cwtext":"警告文", - "selectVis":"公開範囲指定", - "publicJP":"公開", - "unlistedJP":"未収載", - "privateJP":"非公開", - "localJP":"ローカル限定", - "directJP":"ダイレクト", - "sectoot":"こっちでもトゥート", - "emojiWarn":"サーバーちゃうかったら絵文字もちゃうで。", - "emojiInsertWarn":"入力できん絵文字もあるけどしゃーない。", - "refreshEmoji":"絵文字更新", - "closeThisBox":"ボックスなおす", - "showThisEmoji":"一覧を表示中", - "customEmoji":"カスタム絵文字", - "peopleEmoji":"ひと", - "natureEmoji":"自然", - "foodEmoji":"食べ物", - "activityEmoji":"活動", - "placeEmoji":"場所", - "thingsEmoji":"もの", - "symbolEmoji":"記号", - "flagsEmoji":"国旗", + "showSelectProf": "このアカウントのプロフィール出す", + "closethisbox": "このボックスなおす", + "post-new": "投稿", + "toot": "トゥート", + "nsfwDes": "画像を見たらあかんやつにする", + "cwDes": "コンテンツワーニング(ほんまに見るんか？って聞く)", + "selfile": "ファイル選ぶ", + "insertEmoji": "絵文字入れる", + "schedule": "時間指定投稿", + "postat": "時間指定投稿", + "scheduleWarn": "2.7.0~ 5分は待ってな。サーバーの時計おうてるかは知らんで。", + "clearToot": "トゥートボックスのクリア", + "replyMode": "返信モード", + "no": "いいえ", + "yes": "はい", + "temp": "添付ファイル", + "nothing": "なし", + "vis": "公開範囲", + "cwtext": "警告文", + "selectVis": "公開範囲指定", + "publicJP": "公開", + "unlistedJP": "未収載", + "privateJP": "非公開", + "localJP": "ローカル限定", + "directJP": "ダイレクト", + "sectoot": "こっちでもトゥート", + "emojiWarn": "サーバーちゃうかったら絵文字もちゃうで。", + "emojiInsertWarn": "入力できん絵文字もあるけどしゃーない。", + "refreshEmoji": "絵文字更新", + "closeThisBox": "ボックスなおす", + "showThisEmoji": "一覧を表示中", + "customEmoji": "カスタム絵文字", + "peopleEmoji": "ひと", + "natureEmoji": "自然", + "foodEmoji": "食べ物", + "activityEmoji": "活動", + "placeEmoji": "場所", + "thingsEmoji": "もの", + "symbolEmoji": "記号", + "flagsEmoji": "国旗", "draft": "下書き(タンス)", - "poll":"アンケート", - "pollDdisabled":"アンケート付けへん", - "pollProvider":"アンケートのプロバイダ", - "choice":"選択肢", - "polluntil":"あんたが投票するまで票数教えへん", - "pollmulti":"複数選択を許可", - "expires_in":"有効期限(秒)", - "contextBefore":"これより前の会話", - "thisToot":"対象のトゥート", - "contextAfter":"これより後の会話", - "beforeLTL":"これより前のLocal TL(誰にエアリプしてん)", - "beforeUTL":"これより前のユーザーTL(誰のトゥート言及してんねん)", - "afterLTL":"これより後のLocal TL(誰のトゥート言及してんねん)", - "afterUTL":"これより後のユーザーTL(誰のトゥート言及してんねん)", - "afterFTL":"これより後の連合TL(誰のトゥート言及してんねん)", - "favedPeople":"誰がお気に入りに登録してるんや", - "btedPeople":"誰がお気に入りブーストしたんや", - "useOtherAcct1":"他のアカウント使う", - "useOtherAcct2":"の解除はできひん", + "poll": "アンケート", + "pollDdisabled": "アンケート付けへん", + "pollProvider": "アンケートのプロバイダ", + "choice": "選択肢", + "polluntil": "あんたが投票するまで票数教えへん", + "pollmulti": "複数選択を許可", + "expires_in": "有効期限(秒)", + "contextBefore": "これより前の会話", + "thisToot": "対象のトゥート", + "contextAfter": "これより後の会話", + "beforeLTL": "これより前のLocal TL(誰にエアリプしてん)", + "beforeUTL": "これより前のユーザーTL(誰のトゥート言及してんねん)", + "afterLTL": "これより後のLocal TL(誰のトゥート言及してんねん)", + "afterUTL": "これより後のユーザーTL(誰のトゥート言及してんねん)", + "afterFTL": "これより後の連合TL(誰のトゥート言及してんねん)", + "favedPeople": "誰がお気に入りに登録してるんや", + "btedPeople": "誰がお気に入りブーストしたんや", + "useOtherAcct1": "他のアカウント使う", + "useOtherAcct2": "の解除はできひん", "btWithVis": "公開範囲も決めてからブースト", - "reply":"返信", - "bt":"ブースト", - "favRegist":"お気に入り", - "openBrowser":"ブラウザで開く", - "screenshot":"スクリーンショット", - "copyURL":"URLをコピー", - "copy":"コピー", - "embed":"埋め込む", - "toots":"トゥート", - "follow":"フォロー", - "follower":"フォロワー", - "utlColumn":"カラムとして追加", - "timeline":"タイムライン", - "operateOtherAcct":"他のアカウント使うて何かする", - "list":"リスト", - "makeNew":"新しいやつ", - "blocks":"ブロック", - "mutes":"ミュート", - "block":"ブロック", - "mute":"ミュート", - "domainBlock":"ドメインブロック", - "editProf":"プロフィールいらう", - "change":"変更", - "followReq":"フォローリクエスト", - "likeHimOrHer":"似とうユーザー", - "frc":"あんたにおすすめ", - "more":"他無いんか？", - "endorse":"紹介したる", - "openinbrowser":"ブラウザで開く", - "mainacct":"メインアカウントに設定", - "revoverJP":"する", - "warnUseOtherAcct":"(解除はでけへん。)", - "revoverJPde":"で", - "or":"それか", - "openProf":"プロフィール出す", - "warnListRegist":"リストに入れたかったらまずフォローせなあかん。", - "blockDomain":"ブロックするドメイン", - "name":"名前", - "note":"自己紹介", - "editProfImg":"アバター変える", - "editHeader":"ヘッダー変える", - "blocked":"なんでか知らんけどブロックされとるわ", - "likeUserDes":"あんたと似とうユーザーを発掘すんで。", - "get":"取得", - "historyBack":"一つ前のユーザーデータ", - "empUser":"ユーザー強調", - "supportme":"支援してくれんか？", - "TheDeskDes":"TheDeskは営利目的ちゃうし、有料機能や広告は一切あらへん。
せやけど君らが支援してくれとうからTheDeskは続いてるんや。ほんまありがとうな。", - "PatreonSupport":"Patreonで支援", - "PixivSupport":"Pixiv FANBOXで支援", - "AWLSupport":"Amazonほしいものリスト", - "SendAmazonGift1":"", - "SendAmazonGift2":"にAmazonギフトカードを送る", - "monthly":"月額支援(大歓迎)", - "once":"一度限りの支援(めっちゃ歓迎)", - "local":"ローカル", - "localMedia":"ローカル(メディア)", - "home":"ホーム", - "fed":"連合", - "fedMedia":"連合(メディア)", - "dm":"ダイレクトメッセージ", - "integratedTLDes":"統合(ローカルとホーム)", - "localPlusDes":"統合(LTL+BT+返信)", - "notf":"通知", + "reply": "返信", + "bt": "ブースト", + "favRegist": "お気に入り", + "openBrowser": "ブラウザで開く", + "screenshot": "スクリーンショット", + "copyURL": "URLをコピー", + "copy": "コピー", + "embed": "埋め込む", + "toots": "トゥート", + "follow": "フォロー", + "follower": "フォロワー", + "utlColumn": "カラムとして追加", + "timeline": "タイムライン", + "operateOtherAcct": "他のアカウント使うて何かする", + "list": "リスト", + "makeNew": "新しいやつ", + "blocks": "ブロック", + "mutes": "ミュート", + "block": "ブロック", + "mute": "ミュート", + "domainBlock": "ドメインブロック", + "editProf": "プロフィールいらう", + "change": "変更", + "followReq": "フォローリクエスト", + "likeHimOrHer": "似とうユーザー", + "frc": "あんたにおすすめ", + "more": "他無いんか？", + "endorse": "紹介したる", + "openinbrowser": "ブラウザで開く", + "mainacct": "メインアカウントに設定", + "revoverJP": "する", + "warnUseOtherAcct": "(解除はでけへん。)", + "revoverJPde": "で", + "or": "それか", + "openProf": "プロフィール出す", + "warnListRegist": "リストに入れたかったらまずフォローせなあかん。", + "blockDomain": "ブロックするドメイン", + "name": "名前", + "note": "自己紹介", + "editProfImg": "アバター変える", + "editHeader": "ヘッダー変える", + "blocked": "なんでか知らんけどブロックされとるわ", + "likeUserDes": "あんたと似とうユーザーを発掘すんで。", + "get": "取得", + "historyBack": "一つ前のユーザーデータ", + "empUser": "ユーザー強調", + "supportme": "支援してくれんか？", + "TheDeskDes": "TheDeskは営利目的ちゃうし、有料機能や広告は一切あらへん。
せやけど君らが支援してくれとうからTheDeskは続いてるんや。ほんまありがとうな。", + "PatreonSupport": "Patreonで支援", + "PixivSupport": "Pixiv FANBOXで支援", + "AWLSupport": "Amazonほしいものリスト", + "SendAmazonGift1": "", + "SendAmazonGift2": "にAmazonギフトカードを送る", + "monthly": "月額支援(大歓迎)", + "once": "一度限りの支援(めっちゃ歓迎)", + "local": "ローカル", + "localMedia": "ローカル(メディア)", + "home": "ホーム", + "fed": "連合", + "fedMedia": "連合(メディア)", + "dm": "ダイレクトメッセージ", + "integratedTLDes": "統合(ローカルとホーム)", + "localPlusDes": "統合(LTL+BT+返信)", + "notf": "通知", "bookmark": "ブックマーク", - "showThisTL":"表示するタイムライン", - "webviewWarn":"TweetDeckを出すで。TJDeckをカスタムしたものが読み込まれる(Code/TJDeck)。", - "add":"追加", - "search":"検索", - "sortSet":"並べ替え設定", - "selectAcct":"選択(スクロールして全選択肢表示)", - "filterWord":"フィルターワード", - "listLocale":"一覧", - "degree":"適応範囲", - "conver":"会話", - "prof":"プロフィール", - "option":"オプション", - "matchWord":"単語マッチ", - "warnMatchWord":"非ラテン系の文字列では「単語マッチ」はせん方がええで。(これはフリかも知れん)", - "except":"除外", - "exceptWorn":"「除外」にしてもうたらマッチしたトゥートはフィルター解除しても二度と表示されへん。", - "avalableBefore":"有効期限(あと)", - "warnAvBefore":"未指定(または0分)で「無期限」や", - "warnAvBefore2":"この数字はそんなに正確ちゃうで", - "unlimited":"無期限", - "days":"日", - "hours":"時間", - "mins":"分", - "secs":"秒", - "warnOnIntegratedTL":"Integrated TL/Plus TLは、公開/ホームのフィルターワードをどっちも合わせて処理するで", - "helloTheDesk":"やってもうた…再読込して治らんかったら初期化(全データ削除)してな…(予め設定をエクスポートしとくんやで)", - "addColumn":"カラム追加", - "sortColumns":"カラム一覧/並べ替え", - "acctMan":"アカウントマネージャー", - "filter":"フィルター", - "setting":"設定", - "reverse":"トゥートボタンの左右入れ替え", - "f5":"TL再読込", - "nanoDes":"めっちゃ小さいマストドン。", - "verTips":"バージョン", - "clockTips":"時計", - "ramTips":"システムメモリ容量", - "changeTips":"Tips変更", - "helpAndLogs":"ヘルプとログ", - "help":"ヘルプ", - "contactwithlog":"なんか知らんけど動かんとかそういうのを開発者のお兄さんお姉さんに言うときは下のログのそこらへんの時間に起きたなぁってのを拾って連絡するとなんかの助けになるかも知れん。ついでやけどこのウィンドウ全体を横に引き伸ばしたらいい感じに見れるで", - "about":"このソフトについて", - "hereAddColumns":"←ここからTL追加", + "showThisTL": "表示するタイムライン", + "webviewWarn": "TweetDeckを出すで。TJDeckをカスタムしたものが読み込まれる(Code/TJDeck)。", + "add": "追加", + "search": "検索", + "sortSet": "並べ替え設定", + "selectAcct": "選択(スクロールして全選択肢表示)", + "filterWord": "フィルターワード", + "listLocale": "一覧", + "degree": "適応範囲", + "conver": "会話", + "prof": "プロフィール", + "option": "オプション", + "matchWord": "単語マッチ", + "warnMatchWord": "非ラテン系の文字列では「単語マッチ」はせん方がええで。(これはフリかも知れん)", + "except": "除外", + "exceptWorn": "「除外」にしてもうたらマッチしたトゥートはフィルター解除しても二度と表示されへん。", + "avalableBefore": "有効期限(あと)", + "warnAvBefore": "未指定(または0分)で「無期限」や", + "warnAvBefore2": "この数字はそんなに正確ちゃうで", + "unlimited": "無期限", + "days": "日", + "hours": "時間", + "mins": "分", + "secs": "秒", + "warnOnIntegratedTL": "Integrated TL/Plus TLは、公開/ホームのフィルターワードをどっちも合わせて処理するで", + "helloTheDesk": "やってもうた…再読込して治らんかったら初期化(全データ削除)してな…(予め設定をエクスポートしとくんやで)", + "addColumn": "カラム追加", + "sortColumns": "カラム一覧/並べ替え", + "acctMan": "アカウントマネージャー", + "filter": "フィルター", + "setting": "設定", + "reverse": "トゥートボタンの左右入れ替え", + "f5": "TL再読込", + "nanoDes": "めっちゃ小さいマストドン。", + "verTips": "バージョン", + "clockTips": "時計", + "ramTips": "システムメモリ容量", + "changeTips": "Tips変更", + "helpAndLogs": "ヘルプとログ", + "help": "ヘルプ", + "contactwithlog": "なんか知らんけど動かんとかそういうのを開発者のお兄さんお姉さんに言うときは下のログのそこらへんの時間に起きたなぁってのを拾って連絡するとなんかの助けになるかも知れん。ついでやけどこのウィンドウ全体を横に引き伸ばしたらいい感じに見れるで", + "about": "このソフトについて", + "hereAddColumns": "←ここからTL追加", "foundBug": "バグあるんやけど", "show": "表示", "directory": "ディレクトリ", + "discover": "見つける", "active": "最新活動順", "newcomer": "新規順", "local_only": "ローカルだけ", diff --git a/app/view/make/language/ja/index.json b/app/view/make/language/ja/index.json index 5bc9ce4a..061b3b7d 100644 --- a/app/view/make/language/ja/index.json +++ b/app/view/make/language/ja/index.json @@ -1,184 +1,185 @@ { - "draghere":"ここにドラッグして添付(ドラッグと同時にアップロードされます)", - "nowOffline":"オフラインです。投稿はすべて下書きに追加されます。オンライン復帰時には再読み込みを推奨します。", + "draghere": "ここにドラッグして添付(ドラッグと同時にアップロードされます)", + "nowOffline": "オフラインです。投稿はすべて下書きに追加されます。オンライン復帰時には再読み込みを推奨します。", "reOnline": "オンラインに復帰しました。再読み込みを推奨します。", "webSrc": "Webで検索", "tsSrc": "tootsearchで検索", - "close":"Close", - "showSelectProf":"選択したアカウントのプロフィールを表示", - "closethisbox":"このボックスを閉じる", - "post-new":"投稿", - "toot":"トゥート", - "nsfwDes":"画像に制限を付与", - "cwDes":"コンテンツワーニング(トゥートを表示する前にメッセージで隠す)", - "selfile":"ファイルを選択", - "insertEmoji":"絵文字を挿入", - "schedule":"時間指定投稿", - "postat":"時間指定投稿", - "scheduleWarn":"2.7.0~ 5分以内には投稿できません。サーバーの時計が正確とは限りません。", - "clearToot":"トゥートボックスのクリア", - "replyMode":"返信モード", - "no":"いいえ", - "yes":"はい", - "temp":"添付ファイル", - "nothing":"なし", + "close": "Close", + "showSelectProf": "選択したアカウントのプロフィールを表示", + "closethisbox": "このボックスを閉じる", + "post-new": "投稿", + "toot": "トゥート", + "nsfwDes": "画像に制限を付与", + "cwDes": "コンテンツワーニング(トゥートを表示する前にメッセージで隠す)", + "selfile": "ファイルを選択", + "insertEmoji": "絵文字を挿入", + "schedule": "時間指定投稿", + "postat": "時間指定投稿", + "scheduleWarn": "2.7.0~ 5分以内には投稿できません。サーバーの時計が正確とは限りません。", + "clearToot": "トゥートボックスのクリア", + "replyMode": "返信モード", + "no": "いいえ", + "yes": "はい", + "temp": "添付ファイル", + "nothing": "なし", "stamp": "スタンプ", "stampWarn": "画像右下にアカウント名(aa@bb.cc)テキストを挿入します", - "vis":"公開範囲", - "cwtext":"警告文", - "selectVis":"公開範囲指定", - "publicJP":"公開", - "unlistedJP":"未収載", - "privateJP":"非公開", - "localJP":"ローカル限定", - "directJP":"ダイレクト", - "sectoot":"セカンダリートゥート", - "emojiWarn":"サーバーによって実装が異なります。", - "emojiInsertWarn":"一部絵文字は入力できません。", - "refreshEmoji":"絵文字更新", - "closeThisBox":"このボックスを閉じる", - "showThisEmoji":"一覧を表示中", - "customEmoji":"カスタム絵文字", - "peopleEmoji":"ひと", - "natureEmoji":"自然", - "foodEmoji":"食べ物", - "activityEmoji":"活動", - "placeEmoji":"場所", - "thingsEmoji":"もの", - "symbolEmoji":"記号", - "flagsEmoji":"国旗", + "vis": "公開範囲", + "cwtext": "警告文", + "selectVis": "公開範囲指定", + "publicJP": "公開", + "unlistedJP": "未収載", + "privateJP": "非公開", + "localJP": "ローカル限定", + "directJP": "ダイレクト", + "sectoot": "セカンダリートゥート", + "emojiWarn": "サーバーによって実装が異なります。", + "emojiInsertWarn": "一部絵文字は入力できません。", + "refreshEmoji": "絵文字更新", + "closeThisBox": "このボックスを閉じる", + "showThisEmoji": "一覧を表示中", + "customEmoji": "カスタム絵文字", + "peopleEmoji": "ひと", + "natureEmoji": "自然", + "foodEmoji": "食べ物", + "activityEmoji": "活動", + "placeEmoji": "場所", + "thingsEmoji": "もの", + "symbolEmoji": "記号", + "flagsEmoji": "国旗", "draft": "下書き", - "poll":"アンケート", - "pollDdisabled":"アンケートを使用しない", - "pollProvider":"アンケートのプロバイダ", - "choice":"選択肢", - "polluntil":"投票するまで票数を隠す", - "pollmulti":"複数選択を許可", - "expires_in":"有効期限(秒)", - "contextBefore":"これより前の会話", - "thisToot":"対象のトゥート", - "contextAfter":"これより後の会話", - "beforeLTL":"これより前のLocal TL(エアリプソース確認)", - "beforeUTL":"これより前のユーザーTL(BTソース確認)", - "afterLTL":"これより後のLocal TL(言及確認)", - "afterUTL":"これより後のユーザーTL(言及確認)", - "afterFTL":"これより後の連合TL(言及確認)", - "favedPeople":"このトゥートをお気に入りに登録した人", - "btedPeople":"このトゥートをブーストした人", - "useOtherAcct1":"他のアカウントを使用", - "useOtherAcct2":"の解除はできません", + "poll": "アンケート", + "pollDdisabled": "アンケートを使用しない", + "pollProvider": "アンケートのプロバイダ", + "choice": "選択肢", + "polluntil": "投票するまで票数を隠す", + "pollmulti": "複数選択を許可", + "expires_in": "有効期限(秒)", + "contextBefore": "これより前の会話", + "thisToot": "対象のトゥート", + "contextAfter": "これより後の会話", + "beforeLTL": "これより前のLocal TL(エアリプソース確認)", + "beforeUTL": "これより前のユーザーTL(BTソース確認)", + "afterLTL": "これより後のLocal TL(言及確認)", + "afterUTL": "これより後のユーザーTL(言及確認)", + "afterFTL": "これより後の連合TL(言及確認)", + "favedPeople": "このトゥートをお気に入りに登録した人", + "btedPeople": "このトゥートをブーストした人", + "useOtherAcct1": "他のアカウントを使用", + "useOtherAcct2": "の解除はできません", "btWithVis": "公開範囲を指定してブースト", - "reply":"返信", - "bt":"ブースト", - "favRegist":"お気に入り", - "openBrowser":"ブラウザで開く", - "screenshot":"スクリーンショット", - "copyURL":"URLをコピー", - "copy":"コピー", - "embed":"埋め込む", - "toots":"トゥート", - "follow":"フォロー", - "follower":"フォロワー", - "utlColumn":"カラムとして追加", - "timeline":"タイムライン", - "operateOtherAcct":"他のアカウントで操作", - "list":"リスト", - "makeNew":"新規作成", - "blocks":"ブロック", - "mutes":"ミュート", - "block":"ブロック", - "mute":"ミュート", - "domainBlock":"ドメインブロック", - "editProf":"プロフィール編集", - "change":"変更", - "followReq":"フォローリクエスト", - "likeHimOrHer":"似てる", - "frc":"おすすめ", - "more":"もっと", - "endorse":"紹介する", - "openinbrowser":"ブラウザで開く", - "mainacct":"メインアカウントに設定", - "revoverJP":"する", - "warnUseOtherAcct":"(解除はできません。)", - "revoverJPde":"で", - "or":"または", - "openProf":"プロフィールを表示", - "warnListRegist":"リストに追加するためにはフォローが必要です。", - "blockDomain":"ブロックするドメイン", - "name":"名前", - "note":"自己紹介", - "editProfImg":"アバターを変更", - "editHeader":"ヘッダーを変更", - "blocked":"ブロックされています。なぜでしょう？", - "likeUserDes":"似ているユーザーを取得できます。", - "get":"取得", - "historyBack":"一つ前のユーザーデータ", - "empUser":"ユーザー強調", - "supportme":"ご支援ください。", - "TheDeskDes":"TheDeskは営利目的ではないため、有料機能や広告は一切ありません。
皆様のあたたかいご支援のもとで製作されています。", - "PatreonSupport":"Patreonで支援", - "PixivSupport":"Pixiv FANBOXで支援", - "AWLSupport":"Amazonほしいものリスト", - "SendAmazonGift1":"", - "SendAmazonGift2":"にAmazonギフトカードを送る", - "monthly":"月額支援(大歓迎)", - "once":"一度限りの支援(もちろん歓迎)", - "local":"ローカル", - "localMedia":"ローカル(メディア)", - "home":"ホーム", - "fed":"連合", - "fedMedia":"連合(メディア)", - "dm":"ダイレクトメッセージ", - "integratedTLDes":"統合(ローカルとホーム)", - "localPlusDes":"統合(LTL+BT+返信)", - "notf":"通知", + "reply": "返信", + "bt": "ブースト", + "favRegist": "お気に入り", + "openBrowser": "ブラウザで開く", + "screenshot": "スクリーンショット", + "copyURL": "URLをコピー", + "copy": "コピー", + "embed": "埋め込む", + "toots": "トゥート", + "follow": "フォロー", + "follower": "フォロワー", + "utlColumn": "カラムとして追加", + "timeline": "タイムライン", + "operateOtherAcct": "他のアカウントで操作", + "list": "リスト", + "makeNew": "新規作成", + "blocks": "ブロック", + "mutes": "ミュート", + "block": "ブロック", + "mute": "ミュート", + "domainBlock": "ドメインブロック", + "editProf": "プロフィール編集", + "change": "変更", + "followReq": "フォローリクエスト", + "likeHimOrHer": "似てる", + "frc": "おすすめフォロー", + "more": "もっと", + "endorse": "紹介する", + "openinbrowser": "ブラウザで開く", + "mainacct": "メインアカウントに設定", + "revoverJP": "する", + "warnUseOtherAcct": "(解除はできません。)", + "revoverJPde": "で", + "or": "または", + "openProf": "プロフィールを表示", + "warnListRegist": "リストに追加するためにはフォローが必要です。", + "blockDomain": "ブロックするドメイン", + "name": "名前", + "note": "自己紹介", + "editProfImg": "アバターを変更", + "editHeader": "ヘッダーを変更", + "blocked": "ブロックされています。なぜでしょう？", + "likeUserDes": "似ているユーザーを取得できます。", + "get": "取得", + "historyBack": "一つ前のユーザーデータ", + "empUser": "ユーザー強調", + "supportme": "ご支援ください。", + "TheDeskDes": "TheDeskは営利目的ではないため、有料機能や広告は一切ありません。
皆様のあたたかいご支援のもとで製作されています。", + "PatreonSupport": "Patreonで支援", + "PixivSupport": "Pixiv FANBOXで支援", + "AWLSupport": "Amazonほしいものリスト", + "SendAmazonGift1": "", + "SendAmazonGift2": "にAmazonギフトカードを送る", + "monthly": "月額支援(大歓迎)", + "once": "一度限りの支援(もちろん歓迎)", + "local": "ローカル", + "localMedia": "ローカル(メディア)", + "home": "ホーム", + "fed": "連合", + "fedMedia": "連合(メディア)", + "dm": "ダイレクトメッセージ", + "integratedTLDes": "統合(ローカルとホーム)", + "localPlusDes": "統合(LTL+BT+返信)", + "notf": "通知", "bookmark": "ブックマーク", - "showThisTL":"表示するタイムライン", - "webviewWarn":"TweetDeckを表示します。TJDeckをカスタムしたものが読み込まれます(Code/TJDeck)。", - "add":"追加", - "search":"検索", - "sortSet":"並べ替え設定", - "selectAcct":"選択(スクロールで全選択肢表示)", - "filterWord":"フィルターワード", - "listLocale":"一覧", - "degree":"適応範囲", - "conver":"会話", - "prof":"プロフィール", - "option":"オプション", - "matchWord":"単語マッチ", - "warnMatchWord":"非ラテン系の文字列では「単語マッチ」は推奨されません。", - "except":"除外", - "exceptWorn":"「除外」時マッチしたトゥートは非可逆的に除外され、削除後も閲覧できません。", - "avalableBefore":"有効期限(あと)", - "warnAvBefore":"未指定(または0分)で「無期限」になります。", - "warnAvBefore2":"仕様上数値の正確性を保証できません。", - "unlimited":"無期限", - "days":"日", - "hours":"時間", - "mins":"分", - "secs":"秒", - "warnOnIntegratedTL":"Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。", - "helloTheDesk":"内部エラーです。再読込して治らない場合は初期化(全データ削除)をしてください。(事前に設定をエクスポートしておくことをおすすめします。)", - "addColumn":"カラム追加", - "sortColumns":"カラム一覧/並べ替え", - "acctMan":"アカウントマネージャー", - "filter":"フィルター", - "setting":"設定", - "reverse":"トゥートボタンの左右入れ替え", - "f5":"TL再読込", - "nanoDes":"最小のマストドン。", - "verTips":"バージョン", - "clockTips":"時計", - "ramTips":"システムメモリ容量", - "changeTips":"Tips変更", - "helpAndLogs":"ヘルプとログ", - "help":"ヘルプ", - "contactwithlog":"不具合等のお問合わせは以下のログから発生時刻付近のものを集めてご連絡いただけるとスムーズになるかもしれません。また、このメニューウィンドウ全体を横に引き伸ばすとログが見やすくなります。", - "about":"このソフトについて", - "hereAddColumns":"←ここからTL追加", + "showThisTL": "表示するタイムライン", + "webviewWarn": "TweetDeckを表示します。TJDeckをカスタムしたものが読み込まれます(Code/TJDeck)。", + "add": "追加", + "search": "検索", + "sortSet": "並べ替え設定", + "selectAcct": "選択(スクロールで全選択肢表示)", + "filterWord": "フィルターワード", + "listLocale": "一覧", + "degree": "適応範囲", + "conver": "会話", + "prof": "プロフィール", + "option": "オプション", + "matchWord": "単語マッチ", + "warnMatchWord": "非ラテン系の文字列では「単語マッチ」は推奨されません。", + "except": "除外", + "exceptWorn": "「除外」時マッチしたトゥートは非可逆的に除外され、削除後も閲覧できません。", + "avalableBefore": "有効期限(あと)", + "warnAvBefore": "未指定(または0分)で「無期限」になります。", + "warnAvBefore2": "仕様上数値の正確性を保証できません。", + "unlimited": "無期限", + "days": "日", + "hours": "時間", + "mins": "分", + "secs": "秒", + "warnOnIntegratedTL": "Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。", + "helloTheDesk": "内部エラーです。再読込して治らない場合は初期化(全データ削除)をしてください。(事前に設定をエクスポートしておくことをおすすめします。)", + "addColumn": "カラム追加", + "sortColumns": "カラム一覧/並べ替え", + "acctMan": "アカウントマネージャー", + "filter": "フィルター", + "setting": "設定", + "reverse": "トゥートボタンの左右入れ替え", + "f5": "TL再読込", + "nanoDes": "最小のマストドン。", + "verTips": "バージョン", + "clockTips": "時計", + "ramTips": "システムメモリ容量", + "changeTips": "Tips変更", + "helpAndLogs": "ヘルプとログ", + "help": "ヘルプ", + "contactwithlog": "不具合等のお問合わせは以下のログから発生時刻付近のものを集めてご連絡いただけるとスムーズになるかもしれません。また、このメニューウィンドウ全体を横に引き伸ばすとログが見やすくなります。", + "about": "このソフトについて", + "hereAddColumns": "←ここからTL追加", "foundBug": "バグを見つけた", "show": "表示", "directory": "ディレクトリ", + "discover": "見つける", "active": "最新活動順", "newcomer": "新規順", "local_only": "ローカルのみ", diff --git a/app/view/pl-PL/index.html b/app/view/pl-PL/index.html index 36ba490c..eaff0a36 100644 --- a/app/view/pl-PL/index.html +++ b/app/view/pl-PL/index.html @@ -2,1307 +2,1118 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - -
-
-
Szukaj w Internecie
-
Search on tootsearch
-
Copy
-
Toot
-
-
- - - - Feature -
-
- OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet -
-
- Now we are in the Internet, you should reload... -
-
- - -
-
-

Przewodnik powitalny

- Look at the bottom of this window. Here is some tips about it. - -
- account_circle: Menadżer konta
- Add more accounts and logout them. -
- settings: Ustawienia
- Many and many preferences here. You will couldn't check it all! -
- remove_from_queue: TheDesk Nano The smallest Mastodon,
- Mini window client(experimental) -
- apps: Menu
- All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check.
-
- -
-
- -
-
- Przeciągnij tutaj by przesłać -
- -
-
-
-
-
- Post newReaction -
- -
-
-
- - - -
-
- -
- - cancel - - -
-
-
- format_bold - format_italic - format_underlined - strikethrough_s - format_quote - short_text - code - format_list_bulleted - format_list_numbered - - - autorenew - flare - swap_vert - swap_horiz - - Markdownエディタを隠す + + + +
+
+
Szukaj w Internecie
+
Search on tootsearch
+
Copy
+
Toot
+
+
+ + + + Feature +
+
OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet
+
Now we are in the Internet, you should reload...
+
+ + +
+
+

Przewodnik powitalny

+ Look at the bottom of this window. Here is some tips about it. + +
+ account_circle: Menadżer konta
Add more accounts and logout them. +
+ settings: Ustawienia
Many and many preferences here. You will couldn't check it all! +
+ remove_from_queue: TheDesk Nano The smallest Mastodon,
Mini window client(experimental) +
+ apps: Menu
All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check. +
+
+ +
+
+ +
+
+ Przeciągnij tutaj by przesłać +
+ +
+
+
+
+
Post newReaction
+ +
+
+
+ + + +
+
+ +
+ + cancel + + +
+
+
+ format_bold + format_italic + format_underlined + strikethrough_s + format_quote + short_text + code + format_list_bulleted + format_list_numbered + + + autorenew + flare + swap_vert + swap_horiz + + Markdownエディタを隠す + +
+ format_size + px + color_lens + +
+ link +   + +
+ image +   + +
+
+
+
+ + Edit -
- format_size - px - color_lens - -
- link -   - -
- image -   - -
-
-
-
- - Edit - -
-
- +
+
+ -
- -
- - Preview - - - Markdownエディタを表示 - -
-
- visibility_off - public - CW - photo_library - tag_faces - more_vert - clear -
-
-
-
- Reply: Nie/Dołączanie plików: - Brak - Stamp: Off - /Poll:Nie - public - -
- -
- Post at
2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)Expire - mode(beta)
- -
-
-
- - - - - - - - - - -
-
- - -
-
-
-
- -
- - Refresh emojis list -
- -
-
-
+
+ visibility_off + public + CW + photo_library + tag_faces + more_vert + clear +
+
+
+
+ Reply: Nie/Dołączanie plików: + Brak + Stamp: Off /Poll: + Nie + public + +
+ +
+ Post at
2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)Expire mode(beta)
+ +
+
+
+ + + + + + + + + + +
+
+ + - / - -
+
+
+
+ +
+ + Refresh emojis list +
+ +
+
+ + / + + +
+ +
+ +
+
+ + + + + + + dzień (dni) + hour(s) + minute(s) +
+
+
+
+ + -
- - - - + + - -
- -
-
-
ご支援いただけませんか？
- (これは支援の有無に関わらず定期的に出ます。過去のバージョン等で何度も表示される等のバグを確認しております。)
- あなたのMastodon, Misskeyライフを邪魔してしまって申し訳ありません。
- 乞食のようなマネをしてご支援をお願いするのもどうかと思いますが、少々お時間をください。
-
- TheDeskになぜ金銭が発生するかについて: - 詳細は省きますが、開発者から緊急の連絡をしたりするのに使われます。
- 全てのユーザーが安心してTheDeskを使っていただける環境のためにも、ぜひご支援をご検討ください。ご支援いただけなくても使用不可能になることは全くありません。
- TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support! -
-
-
Support me
- It may disturb your Mastodon life, but your support is required to keep TheDesk awesome!
- TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support! -
- -
-
Once
- - Amazon Wish List - -
- Give me Amazon Gift Card:web-pro@cutls.com
- Kyash
-
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + close + +
+
+ + + + + +
+ chevron_right + expand_less + close +
+
+ + +
+ +
+
+ + +
+
+
+ + + +
+
+
ご支援いただけませんか？
+ (これは支援の有無に関わらず定期的に出ます。過去のバージョン等で何度も表示される等のバグを確認しております。)
あなたのMastodon, Misskeyライフを邪魔してしまって申し訳ありません。
乞食のようなマネをしてご支援をお願いするのもどうかと思いますが、少々お時間をください。 +
+
TheDeskになぜ金銭が発生するかについて: 詳細は省きますが、開発者から緊急の連絡をしたりするのに使われます。 +
+ 全てのユーザーが安心してTheDeskを使っていただける環境のためにも、ぜひご支援をご検討ください。ご支援いただけなくても使用不可能になることは全くありません。
+ TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support! +
+
+
Support me
+ It may disturb your Mastodon life, but your support is required to keep TheDesk awesome!
+ TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support! +
+ +
+
Once
+ Amazon Wish List +
Give me Amazon Gift Card: web-pro@cutls.com
Kyash +
+
+
+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/view/pl-PL/setting.html b/app/view/pl-PL/setting.html index 99a63ce2..85e85052 100644 --- a/app/view/pl-PL/setting.html +++ b/app/view/pl-PL/setting.html @@ -688,7 +688,7 @@ style="width:100%; max-width:40rem;">Main author: Cutls@1m.cutls.com
- TheDesk @ 5621ffbe42a1de361ccee0e679c97d30da436aab - 36ad187296f74ae3ed6cb12a4ef26b27d8d13d0f - Sprawdź aktualizacje

@@ -698,7 +698,7 @@
OSS License
-
From 9c49a78318c7fd9f046e563820ef8416c568443b Mon Sep 17 00:00:00 2001 From: Cutls Date: Fri, 18 Jun 2021 16:19:19 +0900 Subject: [PATCH 8/8] New Crowdin updates (#527) * New translations index.json (Romanian) * New translations index.json (Polish) * New translations index.json (Cornish) * New translations index.json (Sinhala) * New translations index.json (Spanish, Argentina) * New translations index.json (Portuguese, Brazilian) * New translations index.json (Vietnamese) * New translations index.json (Chinese Traditional) * New translations index.json (Chinese Simplified) * New translations index.json (Ukrainian) * New translations index.json (Turkish) * New translations index.json (Swedish) * New translations index.json (Serbian (Cyrillic)) * New translations index.json (Russian) * New translations index.json (Portuguese) * New translations index.json (Norwegian) * New translations index.json (French) * New translations index.json (Dutch) * New translations index.json (Italian) * New translations index.json (Hungarian) * New translations index.json (Hebrew) * New translations index.json (Finnish) * New translations index.json (Greek) * New translations index.json (German) * New translations index.json (Danish) * New translations index.json (Czech) * New translations index.json (Catalan) * New translations index.json (Bulgarian) * New translations index.json (Arabic) * New translations index.json (Afrikaans) * New translations index.json (Spanish) * New translations index.json (English) --- app/view/make/language/af-ZA/index.json | 1 + app/view/make/language/ar-SA/index.json | 1 + app/view/make/language/bg-BG/index.json | 1 + app/view/make/language/ca-ES/index.json | 1 + app/view/make/language/cs-CZ/index.json | 1 + app/view/make/language/da-DK/index.json | 1 + app/view/make/language/de-DE/index.json | 1 + app/view/make/language/el-GR/index.json | 1 + app/view/make/language/en-US/index.json | 1 + app/view/make/language/es-AR/index.json | 1 + app/view/make/language/es-ES/index.json | 1 + app/view/make/language/fi-FI/index.json | 1 + app/view/make/language/fr-FR/index.json | 1 + app/view/make/language/he-IL/index.json | 1 + app/view/make/language/hu-HU/index.json | 1 + app/view/make/language/it-IT/index.json | 1 + app/view/make/language/kw-GB/index.json | 1 + app/view/make/language/nl-NL/index.json | 1 + app/view/make/language/no-NO/index.json | 1 + app/view/make/language/pl-PL/index.json | 1 + app/view/make/language/pt-BR/index.json | 1 + app/view/make/language/pt-PT/index.json | 1 + app/view/make/language/ro-RO/index.json | 1 + app/view/make/language/ru-RU/index.json | 1 + app/view/make/language/si-LK/index.json | 1 + app/view/make/language/sr-SP/index.json | 1 + app/view/make/language/sv-SE/index.json | 1 + app/view/make/language/tr-TR/index.json | 1 + app/view/make/language/uk-UA/index.json | 1 + app/view/make/language/vi-VN/index.json | 1 + app/view/make/language/zh-CN/index.json | 1 + app/view/make/language/zh-TW/index.json | 1 + 32 files changed, 32 insertions(+) diff --git a/app/view/make/language/af-ZA/index.json b/app/view/make/language/af-ZA/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/af-ZA/index.json +++ b/app/view/make/language/af-ZA/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/ar-SA/index.json b/app/view/make/language/ar-SA/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/ar-SA/index.json +++ b/app/view/make/language/ar-SA/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/bg-BG/index.json b/app/view/make/language/bg-BG/index.json index 984af7f2..c803c1b6 100644 --- a/app/view/make/language/bg-BG/index.json +++ b/app/view/make/language/bg-BG/index.json @@ -179,6 +179,7 @@ "foundBug": "Намерена е грешка", "show": "Покажи", "directory": "Директория", + "discover": "Discover", "active": "Наскоро активен", "newcomer": "Новодошли", "local_only": "Само местно", diff --git a/app/view/make/language/ca-ES/index.json b/app/view/make/language/ca-ES/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/ca-ES/index.json +++ b/app/view/make/language/ca-ES/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/cs-CZ/index.json b/app/view/make/language/cs-CZ/index.json index c8238b4a..bce85177 100644 --- a/app/view/make/language/cs-CZ/index.json +++ b/app/view/make/language/cs-CZ/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/da-DK/index.json b/app/view/make/language/da-DK/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/da-DK/index.json +++ b/app/view/make/language/da-DK/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/de-DE/index.json b/app/view/make/language/de-DE/index.json index 4d99dd77..0d1f6f63 100644 --- a/app/view/make/language/de-DE/index.json +++ b/app/view/make/language/de-DE/index.json @@ -179,6 +179,7 @@ "foundBug": "Ich habe einen Fehler gefunden", "show": "Zeige", "directory": "Verzeichnis", + "discover": "Discover", "active": "Kürzlich aktiv", "newcomer": "Neu eingetroffen", "local_only": "Nur lokal", diff --git a/app/view/make/language/el-GR/index.json b/app/view/make/language/el-GR/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/el-GR/index.json +++ b/app/view/make/language/el-GR/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/en-US/index.json b/app/view/make/language/en-US/index.json index e21c65ed..162c40dc 100644 --- a/app/view/make/language/en-US/index.json +++ b/app/view/make/language/en-US/index.json @@ -179,6 +179,7 @@ "foundBug": "crwdns4431:0crwdne4431:0", "show": "crwdns3388:0crwdne3388:0", "directory": "crwdns3390:0crwdne3390:0", + "discover": "crwdns4590:0crwdne4590:0", "active": "crwdns3392:0crwdne3392:0", "newcomer": "crwdns3394:0crwdne3394:0", "local_only": "crwdns3396:0crwdne3396:0", diff --git a/app/view/make/language/es-AR/index.json b/app/view/make/language/es-AR/index.json index 9fd054a1..4818f715 100644 --- a/app/view/make/language/es-AR/index.json +++ b/app/view/make/language/es-AR/index.json @@ -179,6 +179,7 @@ "foundBug": "Encontré un error", "show": "Mostrar", "directory": "Directorio", + "discover": "Discover", "active": "Recientemente activo", "newcomer": "Recién llegados", "local_only": "Sólo local", diff --git a/app/view/make/language/es-ES/index.json b/app/view/make/language/es-ES/index.json index c37938da..cae6d893 100644 --- a/app/view/make/language/es-ES/index.json +++ b/app/view/make/language/es-ES/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/fi-FI/index.json b/app/view/make/language/fi-FI/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/fi-FI/index.json +++ b/app/view/make/language/fi-FI/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/fr-FR/index.json b/app/view/make/language/fr-FR/index.json index 04db343e..817cf9ba 100644 --- a/app/view/make/language/fr-FR/index.json +++ b/app/view/make/language/fr-FR/index.json @@ -179,6 +179,7 @@ "foundBug": "J'ai trouvé un bug", "show": "Afficher", "directory": "Répertoire", + "discover": "Discover", "active": "Actif récemment", "newcomer": "Nouveautés", "local_only": "Local uniquement", diff --git a/app/view/make/language/he-IL/index.json b/app/view/make/language/he-IL/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/he-IL/index.json +++ b/app/view/make/language/he-IL/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/hu-HU/index.json b/app/view/make/language/hu-HU/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/hu-HU/index.json +++ b/app/view/make/language/hu-HU/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/it-IT/index.json b/app/view/make/language/it-IT/index.json index 8ed5e9fa..c0ba7474 100644 --- a/app/view/make/language/it-IT/index.json +++ b/app/view/make/language/it-IT/index.json @@ -179,6 +179,7 @@ "foundBug": "Ho trovato un bug", "show": "Mostra", "directory": "Directory", + "discover": "Discover", "active": "Recentemente attivo", "newcomer": "Nuovi arrivi", "local_only": "Solo locale", diff --git a/app/view/make/language/kw-GB/index.json b/app/view/make/language/kw-GB/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/kw-GB/index.json +++ b/app/view/make/language/kw-GB/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/nl-NL/index.json b/app/view/make/language/nl-NL/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/nl-NL/index.json +++ b/app/view/make/language/nl-NL/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/no-NO/index.json b/app/view/make/language/no-NO/index.json index 59d5948d..36e1cee0 100644 --- a/app/view/make/language/no-NO/index.json +++ b/app/view/make/language/no-NO/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Vis", "directory": "Mapper", + "discover": "Discover", "active": "Nylig aktive", "newcomer": "Nykommere", "local_only": "Kun lokalt", diff --git a/app/view/make/language/pl-PL/index.json b/app/view/make/language/pl-PL/index.json index e8da777f..d6952cfa 100644 --- a/app/view/make/language/pl-PL/index.json +++ b/app/view/make/language/pl-PL/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Pokaż", "directory": "Katalog", + "discover": "Discover", "active": "Ostatnio aktywne", "newcomer": "New arrivals", "local_only": "Tylko lokalne", diff --git a/app/view/make/language/pt-BR/index.json b/app/view/make/language/pt-BR/index.json index ee417ccf..891f7cb3 100644 --- a/app/view/make/language/pt-BR/index.json +++ b/app/view/make/language/pt-BR/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Apenas local", diff --git a/app/view/make/language/pt-PT/index.json b/app/view/make/language/pt-PT/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/pt-PT/index.json +++ b/app/view/make/language/pt-PT/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/ro-RO/index.json b/app/view/make/language/ro-RO/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/ro-RO/index.json +++ b/app/view/make/language/ro-RO/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/ru-RU/index.json b/app/view/make/language/ru-RU/index.json index a090b26b..e5944b80 100644 --- a/app/view/make/language/ru-RU/index.json +++ b/app/view/make/language/ru-RU/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Показать", "directory": "Каталог", + "discover": "Discover", "active": "Последние активные", "newcomer": "Новые прибытия", "local_only": "Только локальные", diff --git a/app/view/make/language/si-LK/index.json b/app/view/make/language/si-LK/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/si-LK/index.json +++ b/app/view/make/language/si-LK/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/sr-SP/index.json b/app/view/make/language/sr-SP/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/sr-SP/index.json +++ b/app/view/make/language/sr-SP/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/sv-SE/index.json b/app/view/make/language/sv-SE/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/sv-SE/index.json +++ b/app/view/make/language/sv-SE/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/tr-TR/index.json b/app/view/make/language/tr-TR/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/tr-TR/index.json +++ b/app/view/make/language/tr-TR/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/uk-UA/index.json b/app/view/make/language/uk-UA/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/uk-UA/index.json +++ b/app/view/make/language/uk-UA/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/vi-VN/index.json b/app/view/make/language/vi-VN/index.json index be2f55ef..cb5e6326 100644 --- a/app/view/make/language/vi-VN/index.json +++ b/app/view/make/language/vi-VN/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/zh-CN/index.json b/app/view/make/language/zh-CN/index.json index 2ecf00b4..3b364f5b 100644 --- a/app/view/make/language/zh-CN/index.json +++ b/app/view/make/language/zh-CN/index.json @@ -179,6 +179,7 @@ "foundBug": "I found a bug", "show": "Show", "directory": "Directory", + "discover": "Discover", "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", diff --git a/app/view/make/language/zh-TW/index.json b/app/view/make/language/zh-TW/index.json index 98306cd4..36f59eec 100644 --- a/app/view/make/language/zh-TW/index.json +++ b/app/view/make/language/zh-TW/index.json @@ -179,6 +179,7 @@ "foundBug": "我找到程式臭蟲", "show": "顯示", "directory": "目錄", + "discover": "Discover", "active": "最近上線", "newcomer": "新警察", "local_only": "只有本機",