From 3d0382d279500bfc59f64320ebf98177276525ce Mon Sep 17 00:00:00 2001 From: Cutls Date: Sun, 23 Jun 2019 10:57:56 +0900 Subject: [PATCH] TheDesk Usamin (18.6.3) --- app/js/login/instance.js | 20 ++++++++++---------- app/js/tl/parse.js | 32 ++++++++++++++++++-------------- app/package.json | 2 +- app/view/en/index.html | 6 ++++-- app/view/ja/index.html | 6 ++++-- app/view/make/index.sample.html | 4 +++- app/view/make/make.js | 2 +- app/view/ps/index.html | 6 ++++-- 8 files changed, 45 insertions(+), 33 deletions(-) diff --git a/app/js/login/instance.js b/app/js/login/instance.js index 3aded1ac..a8f9886c 100644 --- a/app/js/login/instance.js +++ b/app/js/login/instance.js @@ -90,16 +90,16 @@ var idata = { "dtp-mstdn.jp_bbcode": "disabled", "dtp-mstdn.jp_markdown": "disabled", "dtp-mstdn.jp_glitch": "disabled", - "misskey.xyz": "misskey", - "misskey.xyz_name": "misskey.xyz", - "misskey.xyz_letters": "1000", - "misskey.xyz_bbcode": "disabled", - "misskey.xyz_markdown": "enabled", - "misskey.xyz_public": "Global", - "misskey.xyz_post": "Post", - "misskey.xyz_fav": " reacted your post.", - "misskey.xyz_bt": " reposted your post.", - "misskey.dev": "misskey", + "misskey.io": "misskey", + "misskey.io_name": "misskey.io", + "misskey.io_letters": "1000", + "misskey.io_bbcode": "disabled", + "misskey.io_markdown": "enabled", + "misskey.io_public": "Global", + "misskey.io_post": "Post", + "misskey.io_fav": " reacted your post.", + "misskey.io_bt": " reposted your post.", + "misskey.dev": "misskey.dev", "misskey.dev_name": "misskey.dev", "misskey.dev_letters": "1024", "misskey.dev_bbcode": "disabled", diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index 77a038db..fba7a0ab 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -432,20 +432,24 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { viashow = "hide"; } else { var via = escapeHTML(toot.application.name); - //強調チェック - Object.keys(empCli).forEach(function (key6) { - var empCliList = empCli[key6]; - if (empCliList == via) { - boostback = "emphasized"; - } - }); - //ミュートチェック - Object.keys(muteCli).forEach(function (key7) { - var muteCliList = muteCli[key7]; - if (muteCliList == via) { - boostback = "hide"; - } - }); + if (empCli) { + //強調チェック + Object.keys(empCli).forEach(function (key6) { + var empCliList = empCli[key6]; + if (empCliList == via) { + boostback = "emphasized"; + } + }); + } + if (muteCli) { + //ミュートチェック + Object.keys(muteCli).forEach(function (key7) { + var muteCliList = muteCli[key7]; + if (muteCliList == via) { + boostback = "hide"; + } + }); + } } if (mix == "pinned") { boostback = "emphasized"; diff --git a/app/package.json b/app/package.json index 0beb8995..b263c78a 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "thedesk", - "version": "18.6.2", + "version": "18.6.3", "description": "TheDesk is a Mastodon client for PC.", "repository": "https://github.com/cutls/TheDesk", "main": "main.js", diff --git a/app/view/en/index.html b/app/view/en/index.html index 7f66534b..c095343f 100644 --- a/app/view/en/index.html +++ b/app/view/en/index.html @@ -37,7 +37,7 @@