From 54db978b6f015db1750ad9e24f38c4d3b82edbcc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 24 Oct 2020 15:56:19 +0000 Subject: [PATCH 1/7] Bump electron from 10.1.2 to 10.1.5 in /app Bumps [electron](https://github.com/electron/electron) from 10.1.2 to 10.1.5. - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/master/docs/breaking-changes.md) - [Commits](https://github.com/electron/electron/compare/v10.1.2...v10.1.5) Signed-off-by: dependabot-preview[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 b01f462b..b17a86a9 100644 --- a/app/package.json +++ b/app/package.json @@ -77,7 +77,7 @@ }, "devDependencies": { "chokidar": "^3.4.2", - "electron": "^10.1.2", + "electron": "^10.1.5", "electron-builder": "^22.8.1", "electron-rebuild": "^2.0.3", "eslint": "^7.9.0", diff --git a/app/yarn.lock b/app/yarn.lock index 06c8e12d..9eac406e 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -1194,10 +1194,10 @@ electron-rebuild@^2.0.3: ora "^5.1.0" yargs "^16.0.0" -electron@^10.1.2: - version "10.1.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-10.1.2.tgz#30b6fd7669f8daf08c56219a61dfa053fa2b0c70" - integrity sha512-SvN8DcKCmPZ0UcQSNAJBfaUu+LGACqtRhUn1rW0UBLHgdbbDM76L0GU5/XGQEllH5pu5bwlCZwax3srzIl+Aeg== +electron@^10.1.5: + version "10.1.5" + resolved "https://registry.yarnpkg.com/electron/-/electron-10.1.5.tgz#f2b161310f627063e73fbac44efcb35dece83a90" + integrity sha512-fys/KnEfJq05TtMij+lFvLuKkuVH030CHYx03iZrW5DNNLwjE6cW3pysJ420lB0FRSfPjTHBMu2eVCf5TG71zQ== dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12" From 4a4dc82c407b73f34cda76a0a260be2c4174a4a9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Nov 2020 20:13:17 +0000 Subject: [PATCH 2/7] Bump eslint from 7.9.0 to 7.13.0 in /app Bumps [eslint](https://github.com/eslint/eslint) from 7.9.0 to 7.13.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v7.9.0...v7.13.0) Signed-off-by: dependabot-preview[bot] --- app/package.json | 2 +- app/yarn.lock | 54 ++++++++++++++++++++++++++++-------------------- 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/app/package.json b/app/package.json index b01f462b..5b2a92f0 100644 --- a/app/package.json +++ b/app/package.json @@ -80,7 +80,7 @@ "electron": "^10.1.2", "electron-builder": "^22.8.1", "electron-rebuild": "^2.0.3", - "eslint": "^7.9.0", + "eslint": "^7.13.0", "readline-sync": "1.4.10" }, "build": { diff --git a/app/yarn.lock b/app/yarn.lock index 06c8e12d..58946781 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -58,10 +58,10 @@ global-agent "^2.0.2" global-tunnel-ng "^2.7.1" -"@eslint/eslintrc@^0.1.3": - version "0.1.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.1.3.tgz#7d1a2b2358552cc04834c0979bd4275362e37085" - integrity sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA== +"@eslint/eslintrc@^0.2.1": + version "0.2.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c" + integrity sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -1287,12 +1287,12 @@ escape-string-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== -eslint-scope@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5" - integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w== +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== dependencies: - esrecurse "^4.1.0" + esrecurse "^4.3.0" estraverse "^4.1.1" eslint-utils@^2.1.0: @@ -1307,22 +1307,27 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint@^7.9.0: - version "7.9.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.9.0.tgz#522aeccc5c3a19017cf0cb46ebfd660a79acf337" - integrity sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA== +eslint-visitor-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" + integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + +eslint@^7.13.0: + version "7.13.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.13.0.tgz#7f180126c0dcdef327bfb54b211d7802decc08da" + integrity sha512-uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ== dependencies: "@babel/code-frame" "^7.0.0" - "@eslint/eslintrc" "^0.1.3" + "@eslint/eslintrc" "^0.2.1" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" debug "^4.0.1" doctrine "^3.0.0" enquirer "^2.3.5" - eslint-scope "^5.1.0" + eslint-scope "^5.1.1" eslint-utils "^2.1.0" - eslint-visitor-keys "^1.3.0" + eslint-visitor-keys "^2.0.0" espree "^7.3.0" esquery "^1.2.0" esutils "^2.0.2" @@ -1371,14 +1376,14 @@ esquery@^1.2.0: dependencies: estraverse "^5.1.0" -esrecurse@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" - integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ== +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== dependencies: - estraverse "^4.1.0" + estraverse "^5.2.0" -estraverse@^4.1.0, estraverse@^4.1.1: +estraverse@^4.1.1: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== @@ -1388,6 +1393,11 @@ estraverse@^5.1.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642" integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw== +estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" From fd3afb6354d2e87cbcf47eb1ac96c89d747bf46d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 11 Nov 2020 20:13:15 +0000 Subject: [PATCH 3/7] Bump sweetalert2 from 10.3.5 to 10.10.0 in /app Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 10.3.5 to 10.10.0. - [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/v10.3.5...v10.10.0) Signed-off-by: dependabot-preview[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 b01f462b..666dabd4 100644 --- a/app/package.json +++ b/app/package.json @@ -68,7 +68,7 @@ "lodash": "^4.17.20", "materialize-css": "git://github.com/cutls/materialize#v1-dev", "sumchecker": "^3.0.1", - "sweetalert2": "^10.3.5", + "sweetalert2": "^10.10.0", "system-font-families": "^0.4.1", "vue": "^2.6.12" }, diff --git a/app/yarn.lock b/app/yarn.lock index 06c8e12d..0fbe5c9c 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -3149,10 +3149,10 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -sweetalert2@^10.3.5: - version "10.3.5" - resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-10.3.5.tgz#e5a10ad789163e85ec6031a413b08b20e5aae0a4" - integrity sha512-8XBQvW2frWVn0Xs80qyraRXcb3Mg/aKG+9sdVPlzViDIYJfLhMeda3pRuyGzyvrPXbBQ3KRjs+66xKH3kz8/og== +sweetalert2@^10.10.0: + version "10.10.0" + resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-10.10.0.tgz#84e8fe1c1c756059196fd89c49790d4bfb954b93" + integrity sha512-TnYWt1hnPw/jkK1IqPpFT4yMZGE9VsKJApzd0dcjsrE8biykeoECpIgV8DzRVvWufit/1Z2m5Zdyo2hjBfGzoQ== system-font-families@^0.4.1: version "0.4.1" From f2a4900f18425fef7ec1c5feb529fc5e00dd63b7 Mon Sep 17 00:00:00 2001 From: cutls Date: Tue, 17 Nov 2020 01:00:32 +0900 Subject: [PATCH 4/7] add: draft --- app/css/post.css | 3 +- app/js/post/emoji.js | 3 + app/js/post/post.js | 23 ++-- app/js/post/secure.js | 80 ++++++++++++- app/js/post/status.js | 148 ++++++++++++------------ app/js/post/suggest.js | 10 +- app/js/tl/poll.js | 1 + app/view/make/index.sample.html | 4 + app/view/make/language/en/index.json | 1 + app/view/make/language/en/main.json | 3 + app/view/make/language/ja-KS/index.json | 1 + app/view/make/language/ja-KS/main.json | 3 + app/view/make/language/ja/index.json | 1 + app/view/make/language/ja/main.json | 3 + 14 files changed, 197 insertions(+), 87 deletions(-) diff --git a/app/css/post.css b/app/css/post.css index 9d46498d..ef434339 100644 --- a/app/css/post.css +++ b/app/css/post.css @@ -64,9 +64,10 @@ textarea { } #emoji { } -#suggest { +#suggest, #draft { max-height: 23rem; overflow-y: scroll; + overflow-x: hidden; } #emoji-list { width: 100%; diff --git a/app/js/post/emoji.js b/app/js/post/emoji.js index 40a54863..a87f4c39 100644 --- a/app/js/post/emoji.js +++ b/app/js/post/emoji.js @@ -23,6 +23,7 @@ function emojiToggle(reaction) { } $('#post-box').css('width', width + 'px') $('#suggest').html('') + $('#draft').html('') if (!localStorage.getItem('emojis_' + acct_id)) { var html = `` $('#emoji-list').html(html) @@ -31,10 +32,12 @@ function emojiToggle(reaction) { } } else { $('#poll').addClass('hide') + $('#draft').addClass('hide') $('#right-side').hide() $('#right-side').css('width', '300px') $('#emoji').addClass('hide') $('#suggest').html('') + $('#draft').html('') $('#left-side').css('width', '100%') var width = localStorage.getItem('postbox-width') if (width) { diff --git a/app/js/post/post.js b/app/js/post/post.js index f35c8a43..5f1aa237 100644 --- a/app/js/post/post.js +++ b/app/js/post/post.js @@ -9,7 +9,7 @@ function sec() { } post(null, mode) } -function post(mode, postvis) { +function post(mode, postvis, dry) { if ($('#toot-post-btn').prop('disabled')) { return false } @@ -122,7 +122,7 @@ function post(mode, postvis) { console.log('This toot will be posted at:' + scheduled) schedule() toot.scheduled_at = scheduled - if($('#sch-box').hasClass('expire')) { + if ($('#sch-box').hasClass('expire')) { toot.scheduled_at = null toot.expires_at = scheduled } @@ -131,7 +131,7 @@ function post(mode, postvis) { } if (!$('#poll').hasClass('hide')) { var options = [] - $('.mastodon-choice').map(function() { + $('.mastodon-choice').map(function () { var choice = $(this).val() if (choice != '') { options.push(choice) @@ -159,6 +159,13 @@ function post(mode, postvis) { } } console.table(toot) + if (dry) { + $('#ideKey').val('') + $('.toot-btn-group').prop('disabled', false) + todc() + toot['TheDeskAcctId'] = acct_id + return toot + } var httpreq = new XMLHttpRequest() httpreq.open('POST', start, true) httpreq.setRequestHeader('Content-Type', 'application/json') @@ -166,11 +173,11 @@ function post(mode, postvis) { httpreq.setRequestHeader('Idempotency-Key', ideKey) httpreq.responseType = 'json' httpreq.send(JSON.stringify(toot)) - httpreq.onreadystatechange = function() { + httpreq.onreadystatechange = function () { if (httpreq.readyState === 4) { var json = httpreq.response if (this.status !== 200) { - if(media && this.status == 422) { + if (media && this.status == 422) { $('#ideKey').val('') $('.toot-btn-group').prop('disabled', false) alertProcessUnfinished() @@ -201,7 +208,7 @@ function post(mode, postvis) { } function expPostMode() { $('#sch-box').toggleClass('expire') - if($('#sch-box').hasClass('expire')) { + if ($('#sch-box').hasClass('expire')) { Swal.fire({ type: 'info', title: 'Expiring toot On' @@ -270,7 +277,7 @@ function misskeyPost() { httpreq.setRequestHeader('Content-Type', 'application/json') httpreq.responseType = 'json' httpreq.send(JSON.stringify(toot)) - httpreq.onreadystatechange = function() { + httpreq.onreadystatechange = function () { if (httpreq.readyState === 4) { if (str.indexOf(localStorage.getItem('stable')) == -1) { localStorage.removeItem('stable') @@ -339,7 +346,7 @@ function clear() { $('#mins_poll').val(6) $('#poll').addClass('hide') $('#pollsta').text(lang.lang_no) - $('.mastodon-choice').map(function() { + $('.mastodon-choice').map(function () { $(this).val('') }) localStorage.removeItem('image') diff --git a/app/js/post/secure.js b/app/js/post/secure.js index 9440344b..1ae60032 100644 --- a/app/js/post/secure.js +++ b/app/js/post/secure.js @@ -100,8 +100,8 @@ function cw_show(e) { $(e).parent().parent().find('.cw_hide').toggleClass('cw') $(e).parent().find('.cw_long').toggleClass('hide') } -$(function() { - $('#cw-text').on('change', function(event) { +$(function () { + $('#cw-text').on('change', function (event) { var acct_id = $('#post-acct-sel').val() var domain = localStorage.getItem('domain_' + acct_id) var cwlen = $('#cw-text').val().length @@ -126,3 +126,79 @@ function schedule() { $('#sch-box').addClass('sch-avail') } } + +//下書き機能 +function draftToggle() { + if ($('#draft').hasClass('hide')) { + $('#draft').removeClass('hide') + $('#right-side').show() + $('#right-side').css('width', '300px') + $('#left-side').css('width', 'calc(100% - 300px)') + var width = localStorage.getItem('postbox-width') + if (width) { + width = width.replace('px', '') * 1 + 300 + } else { + width = 600 + } + $('#post-box').css('width', width + 'px') + $('#suggest').html('') + $('#draft').html('') + draftDraw() + } else { + $('#poll').addClass('hide') + $('#draft').addClass('hide') + $('#right-side').hide() + $('#right-side').css('width', '300px') + $('#emoji').addClass('hide') + $('#suggest').html('') + $('#draft').html('') + $('#left-side').css('width', '100%') + var width = localStorage.getItem('postbox-width') + if (width) { + width = width.replace('px', '') * 1 + } else { + width = 300 + } + $('#post-box').css('width', width + 'px') + } +} +function draftDraw() { + var draft = localStorage.getItem('draft') + var html = `` + if (draft) { + var draftObj = JSON.parse(draft) + for (let i = 0; i < draftObj.length; i++) { + var toot = draftObj[i] + html = html + `
+ reply + cancel + ${escapeHTML(toot.status).replace(/\n/, '').substr(0, 10)} +
` + } + } + $('#draft').html(html) +} +function addToDraft() { + var json = post(null, null, true) + var draft = localStorage.getItem('draft') + var draftObj = [] + if (draft) draftObj = JSON.parse(draft) + draftObj.push(json) + draft = JSON.stringify(draftObj) + localStorage.setItem('draft', draft) + draftDraw() +} +function useThisDraft(i) { + var draft = localStorage.getItem('draft') + var draftObj = JSON.parse(draft) + draftToPost(draftObj[i], draftObj[i]['TheDeskAcctId'], 0) + draftToggle() +} +function deleteThisDraft(i) { + var draft = localStorage.getItem('draft') + var draftObj = JSON.parse(draft) + draftObj.splice(i, 1) + draft = JSON.stringify(draftObj) + localStorage.setItem('draft', draft) + draftDraw() +} \ No newline at end of file diff --git a/app/js/post/status.js b/app/js/post/status.js index 763f12d4..b80890b3 100644 --- a/app/js/post/status.js +++ b/app/js/post/status.js @@ -15,7 +15,7 @@ function fav(id, acct_id, remote) { httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.responseType = 'json' httpreq.send() - httpreq.onreadystatechange = function() { + httpreq.onreadystatechange = function () { if (httpreq.readyState === 4) { var json = httpreq.response if (this.status !== 200) { @@ -75,7 +75,7 @@ function rt(id, acct_id, remote, vis) { } else { httpreq.send() } - httpreq.onreadystatechange = function() { + httpreq.onreadystatechange = function () { if (httpreq.readyState === 4) { var json = httpreq.response if (this.status !== 200) { @@ -131,7 +131,7 @@ function bkm(id, acct_id, tlid) { httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.responseType = 'json' httpreq.send() - httpreq.onreadystatechange = function() { + httpreq.onreadystatechange = function () { if (httpreq.readyState === 4) { var json = httpreq.response if (this.status !== 200) { @@ -160,7 +160,7 @@ function bkm(id, acct_id, tlid) { //フォロー async function follow(acct_id, resolve) { - if($('#his-data').hasClass('locked')) { + if ($('#his-data').hasClass('locked')) { locked = true } else { locked = false @@ -178,7 +178,7 @@ async function follow(acct_id, resolve) { var flag = 'follow' var flagm = 'create' } - + var id = $('#his-data').attr('user-id') if (resolve == 'selector') { var fullacct = $('#his-acct').attr('fullname') @@ -200,7 +200,7 @@ async function follow(acct_id, resolve) { httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.responseType = 'json' httpreq.send(JSON.stringify(ent)) - httpreq.onreadystatechange = function() { + httpreq.onreadystatechange = function () { if (httpreq.readyState === 4) { var json = httpreq.response if (this.status !== 200) { @@ -212,7 +212,7 @@ async function follow(acct_id, resolve) { $('#his-follow-btn-text').text(lang.lang_status_follow) } else { $('#his-data').addClass('following') - if(locked) { + if (locked) { $('#his-follow-btn-text').text(lang.lang_status_requesting) } else { $('#his-follow-btn-text').text(lang.lang_status_unfollow) @@ -278,7 +278,7 @@ function block(acct_id) { httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.responseType = 'json' httpreq.send() - httpreq.onreadystatechange = function() { + httpreq.onreadystatechange = function () { if (httpreq.readyState === 4) { if (this.status !== 200) { setLog(start, this.status, this.response) @@ -338,7 +338,7 @@ function muteDo(acct_id) { httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.responseType = 'json' httpreq.send(rq) - httpreq.onreadystatechange = function() { + httpreq.onreadystatechange = function () { if (httpreq.readyState === 4) { if (this.status !== 200) { setLog(start, this.status, this.response) @@ -378,7 +378,7 @@ function del(id, acct_id) { httpreq.responseType = 'json' httpreq.send() } - httpreq.onreadystatechange = function() { + httpreq.onreadystatechange = function () { if (httpreq.readyState === 4) { if (this.status !== 200) { setLog(start, this.status, this.response) @@ -420,69 +420,73 @@ function redraft(id, acct_id) { httpreq.responseType = 'json' httpreq.send() } - httpreq.onreadystatechange = function() { + httpreq.onreadystatechange = function () { if (httpreq.readyState === 4) { if (this.status !== 200) { setLog(start, this.status, this.response) } var json = httpreq.response - $('#post-acct-sel').prop('disabled', true) - $('#post-acct-sel').val(acct_id) - $('select').formSelect() - mdCheck() - var medias = $('[toot-id=' + id + ']').attr('data-medias') - var mediack = json.media_attachments[0] - //メディアがあれば - var media_ids = [] - if (mediack) { - for (var i = 0; i <= 4; i++) { - if (json.media_attachments[i]) { - media_ids.push(json.media_attachments[i].id) - $('#preview').append( - '' - ) - } else { - break - } - } - } - var vismode = $('[toot-id=' + id + '] .vis-data').attr('data-vis') - vis(vismode) - var medias = media_ids.join(','); - $('#media').val(medias) - localStorage.setItem('nohide', true) - show() - if (json.text) { - var html = json.text - } else { - var html = $('[toot-id=' + id + '] .toot').html() - html = html.replace(/^

(.+)<\/p>$/, '$1') - html = html.replace(//, '\n') - html = html.replace(/

/, '\n') - html = html.replace(/<\/p>/, '\n') - html = html.replace(//g, '$1') - html = $.strip_tags(html) - } - $('#textarea').val(html) - if (json.spoiler_text) { - cw() - $('#cw-text').val(json.spoiler_text) - } - if (json.sensitive) { - $('#nsfw').addClass('yellow-text') - $('#nsfw').html('visibility') - $('#nsfw').addClass('nsfw-avail') - } - if (json.in_reply_to_id) { - $('#reply').val(json.in_reply_to_id) - } + draftToPost(json, acct_id, id) } } } }) } +function draftToPost(json, acct_id, id) { + $('#post-acct-sel').prop('disabled', true) + $('#post-acct-sel').val(acct_id) + $('select').formSelect() + mdCheck() + var medias = $('[toot-id=' + id + ']').attr('data-medias') + mediack = null + if(json.media_attachments) mediack = json.media_attachments[0] + //メディアがあれば + var media_ids = [] + if (mediack) { + for (var i = 0; i <= 4; i++) { + if (json.media_attachments[i]) { + media_ids.push(json.media_attachments[i].id) + $('#preview').append( + '' + ) + } else { + break + } + } + } + var vismode = json.visibility + vis(vismode) + var medias = media_ids.join(',') + $('#media').val(medias) + localStorage.setItem('nohide', true) + show() + if (json.text) { + var html = json.text + } else { + var html = json.status + html = html.replace(/^

(.+)<\/p>$/, '$1') + html = html.replace(//, '\n') + html = html.replace(/

/, '\n') + html = html.replace(/<\/p>/, '\n') + html = html.replace(//g, '$1') + html = $.strip_tags(html) + } + $('#textarea').val(html) + if (json.spoiler_text) { + cw() + $('#cw-text').val(json.spoiler_text) + } + if (json.sensitive) { + $('#nsfw').addClass('yellow-text') + $('#nsfw').html('visibility') + $('#nsfw').addClass('nsfw-avail') + } + if (json.in_reply_to_id) { + $('#reply').val(json.in_reply_to_id) + } +} //ピン留め function pin(id, acct_id) { if ($(`.cvo[unique-id=${id}]`).hasClass('pined')) { @@ -499,7 +503,7 @@ function pin(id, acct_id) { httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.responseType = 'json' httpreq.send() - httpreq.onreadystatechange = function() { + httpreq.onreadystatechange = function () { if (httpreq.readyState === 4) { var json = httpreq.response if (this.status !== 200) { @@ -530,7 +534,7 @@ function request(id, flag, acct_id) { httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.responseType = 'json' httpreq.send() - httpreq.onreadystatechange = function() { + httpreq.onreadystatechange = function () { if (httpreq.readyState === 4) { var json = httpreq.response if (this.status !== 200) { @@ -556,7 +560,7 @@ function domainblock(add, flag, acct_id) { httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.responseType = 'json' httpreq.send() - httpreq.onreadystatechange = function() { + httpreq.onreadystatechange = function () { if (httpreq.readyState === 4) { var json = httpreq.response if (this.status !== 200) { @@ -583,7 +587,7 @@ function empUser() { M.toast({ html: id + lang.lang_status_emphas, displayLength: 4000 }) } else { var can - Object.keys(obj).forEach(function(key) { + Object.keys(obj).forEach(function (key) { var usT = obj[key] if (usT != id && !can) { can = false @@ -615,7 +619,7 @@ function pinUser() { httpreq.setRequestHeader('Authorization', 'Bearer ' + at) httpreq.responseType = 'json' httpreq.send() - httpreq.onreadystatechange = function() { + httpreq.onreadystatechange = function () { if (httpreq.readyState === 4) { var json = httpreq.response if (this.status !== 200) { @@ -651,20 +655,20 @@ function staEx(mode) { Authorization: 'Bearer ' + at } }) - .then(function(response) { + .then(function (response) { if (!response.ok) { - response.text().then(function(text) { + response.text().then(function (text) { setLog(response.url, response.status, text) }) } return response.json() }) - .catch(function(error) { + .catch(function (error) { todo(error) setLog(start, 'JSON', error) console.error(error) }) - .then(function(json) { + .then(function (json) { if (json.statuses) { if (json.statuses[0]) { var id = json.statuses[0].id diff --git a/app/js/post/suggest.js b/app/js/post/suggest.js index 42838b52..26626531 100644 --- a/app/js/post/suggest.js +++ b/app/js/post/suggest.js @@ -18,7 +18,7 @@ input.addEventListener( var new_val = input.value if (new_val == '') { $('#suggest').html('') - if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) { + if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) { $('#right-side').hide() $('#right-side').css('width', '300px') $('#left-side').css('width', '100%') @@ -41,7 +41,7 @@ input.addEventListener( var q = acct[1] } else { $('#suggest').html('') - if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) { + if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) { $('#right-side').hide() $('#right-side').css('width', '300px') $('#left-side').css('width', '100%') @@ -138,6 +138,7 @@ input.addEventListener( $('#post-box').css('width', width + 'px') $('#poll').addClass('hide') $('#emoji').addClass('hide') + $('#draft').addClass('hide') } } else if (json.accounts[0] && acct[1]) { var accts = '' @@ -165,8 +166,9 @@ input.addEventListener( $('#suggest').html(accts) $('#poll').addClass('hide') $('#emoji').addClass('hide') + $('#draft').addClass('hide') } else { - if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) { + if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) { $('#right-side').hide() $('#right-side').css('width', '300px') $('#left-side').css('width', '100%') @@ -226,7 +228,7 @@ function tagInsert(code, del) { } sentence = before + word + after textarea.value = sentence - if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) { + if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) { $('#right-side').hide() $('#right-side').css('width', '300px') $('#left-side').css('width', '50%') diff --git a/app/js/tl/poll.js b/app/js/tl/poll.js index 212fe844..2dd887c8 100644 --- a/app/js/tl/poll.js +++ b/app/js/tl/poll.js @@ -25,6 +25,7 @@ function pollToggle() { } $('#post-box').css('width', width + 'px') $('#emoji').addClass('hide') + $('#draft').addClass('hide') $('#poll').addClass('hide') $('#pollsta').text(lang.lang_no) } diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 20b535ab..51e5f325 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -278,6 +278,9 @@

  • @@poll@@
    • +
  • + @@draft@@ +
    • @@ -297,6 +300,7 @@
    +
    @@emojiWarn@@ diff --git a/app/view/make/language/en/index.json b/app/view/make/language/en/index.json index f989480a..2c8e3446 100644 --- a/app/view/make/language/en/index.json +++ b/app/view/make/language/en/index.json @@ -45,6 +45,7 @@ "thingsEmoji":"Emojis of tools", "symbolEmoji":"Emojis of symbols", "flagsEmoji":"Emojis of flags", + "draft": "Draft", "poll":"Poll", "pollDdisabled":"Polls: Disabled", "pollProvider":"Provider of Poll", diff --git a/app/view/make/language/en/main.json b/app/view/make/language/en/main.json index 34671b3f..67576efc 100644 --- a/app/view/make/language/en/main.json +++ b/app/view/make/language/en/main.json @@ -87,6 +87,9 @@ "lang_status_endorse": "Feature on profile", "lang_status_followers": "Followers", "lang_status_active": "Last status", + "lang_secure_draft": "Add to draft", + "lang_secure_useThis": "Use this", + "lang_secure_deleteThis": "Delete this", "lang_suggest_nodata": "Please get emojis list in order to show suggestion.", "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.", "lang_cards_check": " check", diff --git a/app/view/make/language/ja-KS/index.json b/app/view/make/language/ja-KS/index.json index 9a8456ec..8f6e6e86 100644 --- a/app/view/make/language/ja-KS/index.json +++ b/app/view/make/language/ja-KS/index.json @@ -43,6 +43,7 @@ "thingsEmoji":"もの", "symbolEmoji":"記号", "flagsEmoji":"国旗", + "draft": "下書き(タンス)", "poll":"アンケート", "pollDdisabled":"アンケート付けへん", "pollProvider":"アンケートのプロバイダ", diff --git a/app/view/make/language/ja-KS/main.json b/app/view/make/language/ja-KS/main.json index b6724844..6fc69537 100644 --- a/app/view/make/language/ja-KS/main.json +++ b/app/view/make/language/ja-KS/main.json @@ -86,6 +86,9 @@ "lang_status_endorse": "プロフで紹介する", "lang_status_followers": "フォロワー", "lang_status_active": "最新トゥート", + "lang_secure_draft": "タンスになおす", + "lang_secure_useThis": "使う", + "lang_secure_deleteThis": "ほかす", "lang_suggest_nodata": "サジェストしたいんやけど、絵文字リストを取得してくれへん？", "lang_usetxtbox_reply": "返信モードや。やめるときはCtrl+Shift+Cな。", "lang_cards_check": "チェック", diff --git a/app/view/make/language/ja/index.json b/app/view/make/language/ja/index.json index 18e85a5d..9b6a8c05 100644 --- a/app/view/make/language/ja/index.json +++ b/app/view/make/language/ja/index.json @@ -45,6 +45,7 @@ "thingsEmoji":"もの", "symbolEmoji":"記号", "flagsEmoji":"国旗", + "draft": "下書き", "poll":"アンケート", "pollDdisabled":"アンケートを使用しない", "pollProvider":"アンケートのプロバイダ", diff --git a/app/view/make/language/ja/main.json b/app/view/make/language/ja/main.json index 2c0ab97c..e46644fd 100644 --- a/app/view/make/language/ja/main.json +++ b/app/view/make/language/ja/main.json @@ -88,6 +88,9 @@ "lang_status_endorse": "プロフで紹介する", "lang_status_followers": "フォロワー", "lang_status_active": "最新トゥート", + "lang_secure_draft": "下書きに追加", + "lang_secure_useThis": "使う", + "lang_secure_deleteThis": "削除", "lang_suggest_nodata": "サジェストのために絵文字リストを取得してください。", "lang_usetxtbox_reply": "返信モードです。クリアするときはCtrl+Shift+Cを押してください。", "lang_cards_check": "チェック", From fa20278727926dc5e6eb8c4bc9c7f7aca40d0015 Mon Sep 17 00:00:00 2001 From: cutls Date: Tue, 17 Nov 2020 01:10:59 +0900 Subject: [PATCH 5/7] CW when reply --- app/js/common/keyshortcut.js | 3 ++- app/js/post/secure.js | 4 ++-- app/js/post/status.js | 2 +- app/js/post/use-txtbox.js | 9 +++++++-- app/js/tl/parse.js | 2 +- app/view/make/setting.sample.js | 11 +++++++++++ 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/app/js/common/keyshortcut.js b/app/js/common/keyshortcut.js index 07722f61..6bfee7fe 100644 --- a/app/js/common/keyshortcut.js +++ b/app/js/common/keyshortcut.js @@ -227,7 +227,8 @@ $(function($) { var acct_id = $('#timeline_' + selectedColumn).attr('data-acct') var ats_cm = $('.selectedToot .rep-btn').attr('data-men') var mode = $('.selectedToot .rep-btn').attr('data-visen') - re(id, ats_cm, acct_id, mode) + var cwTxt = $('#cw-text').val() + re(id, ats_cm, acct_id, mode, cwTxt) return false } } diff --git a/app/js/post/secure.js b/app/js/post/secure.js index 1ae60032..9ea56518 100644 --- a/app/js/post/secure.js +++ b/app/js/post/secure.js @@ -79,8 +79,8 @@ function loadVis() { loadVis() //コンテントワーニング -function cw() { - if ($('#cw').hasClass('cw-avail')) { +function cw(force) { + if ($('#cw').hasClass('cw-avail') || !force) { $('#cw-text').val() $('#cw-text').hide() $('#cw').removeClass('yellow-text') diff --git a/app/js/post/status.js b/app/js/post/status.js index b80890b3..0e96b64b 100644 --- a/app/js/post/status.js +++ b/app/js/post/status.js @@ -475,7 +475,7 @@ function draftToPost(json, acct_id, id) { } $('#textarea').val(html) if (json.spoiler_text) { - cw() + cw(true) $('#cw-text').val(json.spoiler_text) } if (json.sensitive) { diff --git a/app/js/post/use-txtbox.js b/app/js/post/use-txtbox.js index 9e272df2..e7a347c2 100644 --- a/app/js/post/use-txtbox.js +++ b/app/js/post/use-txtbox.js @@ -1,5 +1,5 @@ /*リプライ*/ -function re(id, ats_cm, acct_id, mode) { +function re(id, ats_cm, acct_id, mode, cwTxt) { clear() var ats = ats_cm.split(',') localStorage.setItem('nohide', true) @@ -25,13 +25,18 @@ function re(id, ats_cm, acct_id, mode) { } $('#acct-sel-prof').attr('src', profimg) vis(mode) + if(localStorage.getItem('cw-continue') == 'yes') { + cw(true) + $('#cw-text').val(cwTxt) + } } function reEx(id) { $('#tootmodal').modal('close') var at = $('#tootmodal').attr('data-user') var acct_id = $('#status-acct-sel').val() var mode = $('#tootmodal .vis-data').attr('data-vis') - re(id, at, acct_id, mode) + var cwTxt = $('#cw-text').val() + re(id, at, acct_id, mode, cwTxt) } //引用 function qt(id, acct_id, at, url) { diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index 6afcca0d..98befa14 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -1085,7 +1085,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
    - diff --git a/app/view/make/setting.sample.js b/app/view/make/setting.sample.js index dd81cf07..0a4a1c61 100644 --- a/app/view/make/setting.sample.js +++ b/app/view/make/setting.sample.js @@ -523,6 +523,17 @@ var postConstruction = [ checkbox: yesno } }, + { + id: 'cw-continue', + storage: 'cw-continue', + checkbox: true, + setValue: 'no', + text: { + head: '@@cwContinue@@', + desc: '', + checkbox: yesno + } + }, { id: 'vis', storage: 'vis', From 790ab2065caacb9c3d377c70f07c23e2c019661e Mon Sep 17 00:00:00 2001 From: cutls Date: Tue, 17 Nov 2020 01:36:07 +0900 Subject: [PATCH 6/7] when in offline --- app/css/master.css | 33 +++++++++++++++++++------ app/js/platform/end.js | 10 +++++--- app/js/post/post.js | 9 +++++++ app/js/post/secure.js | 4 +-- app/package.json | 2 +- app/view/make/index.sample.html | 6 +++++ app/view/make/language/en/index.json | 2 ++ app/view/make/language/en/main.json | 1 + app/view/make/language/ja-KS/index.json | 2 ++ app/view/make/language/ja-KS/main.json | 1 + app/view/make/language/ja/index.json | 2 ++ app/view/make/language/ja/main.json | 1 + 12 files changed, 59 insertions(+), 14 deletions(-) diff --git a/app/css/master.css b/app/css/master.css index d357ab90..c91623f9 100644 --- a/app/css/master.css +++ b/app/css/master.css @@ -21,7 +21,8 @@ html { .action-menu-item:hover { filter: brightness(80%) !important; } -.btn, .btn-flat { +.btn, +.btn-flat { font-size: 1.1rem; margin: 0.4rem; text-transform: none; @@ -340,16 +341,16 @@ blockquote:before, flex-wrap: wrap; flex-direction: column; } -input[type="color"] { +input[type='color'] { -webkit-appearance: none; border: none; width: 32px; height: 32px; } -input[type="color"]::-webkit-color-swatch-wrapper { +input[type='color']::-webkit-color-swatch-wrapper { padding: 0; } -input[type="color"]::-webkit-color-swatch { +input[type='color']::-webkit-color-swatch { border: none; } #menu { @@ -631,6 +632,24 @@ button { } .via-dropdown { text-overflow: ellipsis; - white-space: nowrap; - overflow-x: hidden; -} \ No newline at end of file + white-space: nowrap; + overflow-x: hidden; +} +#re-online { + background-color: rgb(38, 92, 153); + position: fixed; + width: 100vw; + height: 2rem; + padding: 0.25rem; + color: white; + z-index: 1000; +} +#offline { + background-color: rgb(153, 38, 38); + position: fixed; + width: 100vw; + height: 2rem; + padding: 0.25rem; + color: white; + z-index: 999; +} diff --git a/app/js/platform/end.js b/app/js/platform/end.js index 4e9eb1a8..32b828a6 100644 --- a/app/js/platform/end.js +++ b/app/js/platform/end.js @@ -219,10 +219,12 @@ if(pwa) { const connection = function (event) { console.log(navigator.onLine, 'network state') if(!navigator.onLine) { - $('#toot-post-btn').addClass('disabled') - } else { - $('#toot-post-btn').removeClass('disabled') + $('#re-online').addClass('hide') + $('#offline').removeClass('hide') + } else if(!$('#offline').hasClass('hide')) { + $('#offline').addClass('hide') + $('#re-online').removeClass('hide') } } window.onoffline = connection -window.ononline = connection \ No newline at end of file +window.ononline = connection diff --git a/app/js/post/post.js b/app/js/post/post.js index 5f1aa237..3a3e3aaf 100644 --- a/app/js/post/post.js +++ b/app/js/post/post.js @@ -10,6 +10,15 @@ function sec() { post(null, mode) } function post(mode, postvis, dry) { + if(!navigator.onLine && !dry) { + draftToggle(true) + addToDraft() + M.toast({ + html: lang.lang_post_offline, + displayLength: 3000 + }) + return false + } if ($('#toot-post-btn').prop('disabled')) { return false } diff --git a/app/js/post/secure.js b/app/js/post/secure.js index 9ea56518..9e7351d9 100644 --- a/app/js/post/secure.js +++ b/app/js/post/secure.js @@ -128,8 +128,8 @@ function schedule() { } //下書き機能 -function draftToggle() { - if ($('#draft').hasClass('hide')) { +function draftToggle(force) { + if ($('#draft').hasClass('hide') || force) { $('#draft').removeClass('hide') $('#right-side').show() $('#right-side').css('width', '300px') diff --git a/app/package.json b/app/package.json index b01f462b..7151db7e 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "thedesk", - "version": "21.2.4", + "version": "21.2.5", "codename": "Mayu", "description": "TheDesk is a Mastodon client for PC.", "repository": "https://github.com/cutls/TheDesk", diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 51e5f325..17ffb5c1 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -43,6 +43,12 @@ chat
    +
    + @@nowOffline@@ +
    +
    + @@reOnline@@ +
    diff --git a/app/view/make/language/en/index.json b/app/view/make/language/en/index.json index 2c8e3446..c7109f34 100644 --- a/app/view/make/language/en/index.json +++ b/app/view/make/language/en/index.json @@ -1,5 +1,7 @@ { "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", diff --git a/app/view/make/language/en/main.json b/app/view/make/language/en/main.json index 67576efc..fb72507d 100644 --- a/app/view/make/language/en/main.json +++ b/app/view/make/language/en/main.json @@ -71,6 +71,7 @@ "lang_post_btn3": "Continue to post", "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.", "lang_post_retry": "Retry", + "lang_post_offline": "Add to the drafts because of offline", "lang_status_favWarn": "It will take a miunte to favourite a remote toot.", "lang_status_btWarn": "It will take a miunte to boost a remote toot.", "lang_status_follow": "Follow", diff --git a/app/view/make/language/ja-KS/index.json b/app/view/make/language/ja-KS/index.json index 8f6e6e86..2b6a97c5 100644 --- a/app/view/make/language/ja-KS/index.json +++ b/app/view/make/language/ja-KS/index.json @@ -1,5 +1,7 @@ { "draghere":"ドラッグしてみ？(ドラッグしたらすぐアップロードされるで)", + "nowOffline":"オフラインやで。投稿は全部下書きに行くし、もしオンラインなったら再読み込みしたらええで。", + "reOnline":"オンライン戻ったから再読み込みしてな。", "close":"Close", "webSrc": "Webでさがす", "tsSrc": "tootsearchでさがす", diff --git a/app/view/make/language/ja-KS/main.json b/app/view/make/language/ja-KS/main.json index 6fc69537..16fb80e8 100644 --- a/app/view/make/language/ja-KS/main.json +++ b/app/view/make/language/ja-KS/main.json @@ -72,6 +72,7 @@ "lang_status_btWarn": "ブーストしたんやけどインスタンスがちゃうときは時間がかかるで、知らんけど。", "lang_post_unfinishedMedia": "処理未了のメディアがあります。再試行してください。", "lang_post_retry": "再試行", + "lang_post_offline": "オフラインやったし下書きいれといたで", "lang_status_follow": "フォロー", "lang_status_unfollow": "フォロー解除", "lang_status_block": "ブロック", diff --git a/app/view/make/language/ja/index.json b/app/view/make/language/ja/index.json index 9b6a8c05..3f6be5b1 100644 --- a/app/view/make/language/ja/index.json +++ b/app/view/make/language/ja/index.json @@ -1,5 +1,7 @@ { "draghere":"ここにドラッグして添付(ドラッグと同時にアップロードされます)", + "nowOffline":"オフラインです。投稿はすべて下書きに追加されます。オンライン復帰時には再読み込みを推奨します。", + "reOnline": "オンラインに復帰しました。再読み込みを推奨します。", "webSrc": "Webで検索", "tsSrc": "tootsearchで検索", "close":"Close", diff --git a/app/view/make/language/ja/main.json b/app/view/make/language/ja/main.json index e46644fd..3ff366d7 100644 --- a/app/view/make/language/ja/main.json +++ b/app/view/make/language/ja/main.json @@ -72,6 +72,7 @@ "lang_post_btn3": "そのまま投稿", "lang_post_unfinishedMedia": "処理未了のメディアがあります。再試行してください。", "lang_post_retry": "再試行", + "lang_post_offline": "オフラインのため下書きに追加しました。", "lang_status_favWarn": "お気に入り登録しました。インスタンスが違うときは時間がかかる場合があります。", "lang_status_btWarn": "ブーストしました。インスタンスが違うときは時間がかかる場合があります。", "lang_status_follow": "フォロー", From a7399db3f1cc5689f8c857c2efcd64f2beaa38cf Mon Sep 17 00:00:00 2001 From: cutls Date: Tue, 17 Nov 2020 01:56:58 +0900 Subject: [PATCH 7/7] TheDesk 21.3.0 --- app/package.json | 2 +- app/view/make/index.sample.html | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/package.json b/app/package.json index 7151db7e..c8ebdb92 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "thedesk", - "version": "21.2.5", + "version": "21.3.0", "codename": "Mayu", "description": "TheDesk is a Mastodon client for PC.", "repository": "https://github.com/cutls/TheDesk", diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 17ffb5c1..fd4d0bbf 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -775,7 +775,7 @@ HP
    GitHub

    -