From 16b68bb19079221932b3a2ccf0f35adff37fb321 Mon Sep 17 00:00:00 2001 From: cutls Date: Wed, 9 Sep 2020 17:15:19 +0900 Subject: [PATCH] TheDesk 21.2.0 (Mayu) --- README.md | 5 ++++- README_ja.md | 2 ++ app/js/tl/parse.js | 6 +++++- app/js/tl/src.js | 6 +++--- app/view/make/index.sample.html | 25 ++++++++----------------- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index d342e1eb..3a694a0f 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,10 @@ Mastodon/Misskey client for PC(Windows/Linux/macOS) オープンソースSNSマストドン/MisskeyのPC向けクライアント[日本語はこちら](README_ja.md) -Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com) +Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com) + +On GitHub Releases, `-store.*` assets are made for some application store or manager(Snapcraft, Homebrew, Microsoft Store). +They do not check the latest version(Which you can get the latest ver or not depends on the store) Become a Patron! Donate using Liberapay diff --git a/README_ja.md b/README_ja.md index 9f9e01ae..826d5c2f 100644 --- a/README_ja.md +++ b/README_ja.md @@ -14,6 +14,8 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge [Pixiv FANBOX](https://www.pixiv.net/fanbox/creator/28105985) +`-store.*`とあるアセットはストアやパッケージマネージャ向けのもので、アップデートの確認をソフト本体で行いません。 + ![Screenshots1](https://thedesk.top/img/scr1.png) ## ライセンス diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index 79ad6abe..c52519ee 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -1554,7 +1554,11 @@ function mastodonBaseStreaming(acct_id) { if(mastodonBaseWsStatus[domain]) return mastodonBaseWsStatus[domain] = 'undetected' const at = localStorage.getItem(`acct_${acct_id}_at`) - const start = `wss://${domain}/api/v1/streaming/?access_token=${at}` + let wss = 'wss://' + domain + if (localStorage.getItem('streaming_' + acct_id)) { + wss = localStorage.getItem('streaming_' + acct_id) + } + const start = `${wss}/api/v1/streaming/?access_token=${at}` mastodonBaseWs[domain] = new WebSocket(start) mastodonBaseWs[domain].onopen = function () { mastodonBaseWsStatus[domain] = 'connecting' diff --git a/app/js/tl/src.js b/app/js/tl/src.js index ccb363c4..e46e9d18 100644 --- a/app/js/tl/src.js +++ b/app/js/tl/src.js @@ -219,9 +219,9 @@ function moreTs(tlid, q) { function graphDraw(tag, acct_id) { var tags = '' var his = tag.history - return graphDrawCore(his, tag) + return graphDrawCore(his, tag, acct_id) } -function graphDrawCore(his, tag) { +function graphDrawCore(his, tag, acct_id) { var max = Math.max.apply(null, [ his[0].uses, his[1].uses, @@ -307,7 +307,7 @@ function trend() { Object.keys(json).forEach(function(keye) { var tag = json[keye] var his = tag.history - tags = graphDrawCore(his, tag) + tags = graphDrawCore(his, tag, acct_id) $('#src-contents').append(tags) }) diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 303f5ed2..5f2723d2 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -1123,29 +1123,20 @@ HP
GitHub

-