From 0df8baa7bfdcec8174b54e2abb55e770b3642370 Mon Sep 17 00:00:00 2001 From: Cutls Date: Tue, 2 Apr 2019 23:42:25 +0900 Subject: [PATCH] TheDesk Usamin (18.1.2) Plus --- app/css/tl.css | 6 ++++++ app/js/lang/lang.en.js | 1 + app/js/lang/lang.ja.js | 1 + app/js/tl/filter.js | 10 ++++++++++ app/js/tl/parse.js | 3 +++ app/js/ui/layout.js | 1 + app/view/en/index.html | 6 +++--- app/view/en/setting.html | 2 +- app/view/ja/index.html | 6 +++--- app/view/ja/setting.html | 2 +- app/view/make/index.sample.html | 6 +++--- app/view/make/language/index.en.json | 1 + app/view/make/language/index.ja.json | 1 + app/view/make/setting.sample.html | 2 +- app/view/ps/index.html | 6 +++--- app/view/ps/setting.html | 2 +- 16 files changed, 40 insertions(+), 16 deletions(-) diff --git a/app/css/tl.css b/app/css/tl.css index 31daf889..04fbd169 100644 --- a/app/css/tl.css +++ b/app/css/tl.css @@ -114,6 +114,12 @@ iframe { flex-direction: column; margin-bottom: -10px; } +.img_FTL{ + display:none; +} +.bbcode_FTL{ + display:none; +} .boxIn{ height:100%; border: thin solid gray; diff --git a/app/js/lang/lang.en.js b/app/js/lang/lang.en.js index 56ec973a..37320ed2 100644 --- a/app/js/lang/lang.en.js +++ b/app/js/lang/lang.en.js @@ -153,6 +153,7 @@ var lang={ "lang_parse_faved":" favourited your toot", "lang_parse_bted":" boosted your toot", "lang_parse_btedsimple":" boosted", + "lang_parse_polled":"'s poll", "lang_parse_notftime":"Actioned at", "lang_parse_cwshow":"Show", "lang_parse_fulltext":"Full size text:", diff --git a/app/js/lang/lang.ja.js b/app/js/lang/lang.ja.js index 8d12d44e..4dacbf4b 100644 --- a/app/js/lang/lang.ja.js +++ b/app/js/lang/lang.ja.js @@ -153,6 +153,7 @@ var lang={ "lang_parse_faved":"がお気に入り登録しました", "lang_parse_bted":"がブーストしました", "lang_parse_btedsimple":"がブースト", + "lang_parse_polled":"のアンケート", "lang_parse_notftime":"通知された時間", "lang_parse_cwshow":"見る", "lang_parse_fulltext":"以下全文", diff --git a/app/js/tl/filter.js b/app/js/tl/filter.js index 09cc104c..f4a5fa0a 100644 --- a/app/js/tl/filter.js +++ b/app/js/tl/filter.js @@ -421,6 +421,16 @@ function exclude(key){ }else{ excludetxt="?exclude_types[]=follow" } + var follow=true; + }else{ + var follow=false; + } + if($('#exc-poll-'+key+':checked').val()){ + if(reply || bt || fav || follow){ + excludetxt=excludetxt+"&exclude_types[]=poll" + }else{ + excludetxt="?exclude_types[]=poll" + } }else{ } localStorage.setItem("exclude-"+key,excludetxt) diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index b29c91f3..1f0e1541 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -228,6 +228,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { if(!locale && localStorage.getItem("fav_" + acct_id)){ what = localStorage.getItem("fav_" + acct_id); } + } else if (toot.type == "poll") { + var what = lang.lang_parse_polled; + var icon = "fa-tasks purple-text"; } var noticetext = '' + date(toot.created_at, diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js index 9a6bee76..b024f4e6 100644 --- a/app/js/ui/layout.js +++ b/app/js/ui/layout.js @@ -146,6 +146,7 @@ function parseColumn() { ' '+ ' '+ ' '+ + ' '+ '
'; }else if(acct.type=="home"){ var exclude=' Support on Enty - - Osushi.love: give me sushi - + + Support on Pixiv FANBOX + Amazon Wish List diff --git a/app/view/en/setting.html b/app/view/en/setting.html index 5e6b00f2..923165a0 100644 --- a/app/view/en/setting.html +++ b/app/view/en/setting.html @@ -350,10 +350,10 @@ webWebsite trending_upSupport(Enty) +trending_upSupport(Pixiv FANBOX) listHelp/Docs(Constructing) GitHub Developer: Cutls@kirishima.cloud -Give me a sushi!
Kyash

diff --git a/app/view/ja/index.html b/app/view/ja/index.html index 91352038..fc12c2dd 100644 --- a/app/view/ja/index.html +++ b/app/view/ja/index.html @@ -608,9 +608,9 @@ var tlid=0; Entyで支援 - - Osushi.loveで寿司を贈る - + + Pixiv FANBOXで支援 + Amazonほしいものリスト diff --git a/app/view/ja/setting.html b/app/view/ja/setting.html index 7a41a942..d8006b68 100644 --- a/app/view/ja/setting.html +++ b/app/view/ja/setting.html @@ -350,10 +350,10 @@ web公式HP trending_up支援(Enty) +trending_up支援(Pixiv FANBOX) listヘルプ/Docs(Constructing) GitHub Developer: Cutls@kirishima.cloud -寿司を投げる
Kyash

diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 1808935e..c9503230 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -608,9 +608,9 @@ var tlid=0; {{EntySupport}} - - {{sendSushi}} - + + {{PixivSupport}} + {{AWLSupport}} diff --git a/app/view/make/language/index.en.json b/app/view/make/language/index.en.json index 12e5cdb8..136f19c1 100644 --- a/app/view/make/language/index.en.json +++ b/app/view/make/language/index.en.json @@ -105,6 +105,7 @@ "supportme":"Support TheDesk!", "TheDeskDes":"TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!", "EntySupport":"Support on Enty", + "PixivSupport":"Support on Pixiv FANBOX", "AWLSupport":"Amazon Wish List", "SendAmazonGift1":"Give me Amazon Gift Card:", "SendAmazonGift2":"", diff --git a/app/view/make/language/index.ja.json b/app/view/make/language/index.ja.json index 1839852d..5fab7702 100644 --- a/app/view/make/language/index.ja.json +++ b/app/view/make/language/index.ja.json @@ -105,6 +105,7 @@ "supportme":"ご支援ください。", "TheDeskDes":"TheDeskは営利目的ではないため、有料機能や広告は一切ありません。
皆様のあたたかいご支援のもとで製作されています。", "EntySupport":"Entyで支援", + "PixivSupport":"Pixiv FANBOXで支援", "AWLSupport":"Amazonほしいものリスト", "SendAmazonGift1":"", "SendAmazonGift2":"にAmazonギフトカードを送る", diff --git a/app/view/make/setting.sample.html b/app/view/make/setting.sample.html index 90144751..fa711ef3 100644 --- a/app/view/make/setting.sample.html +++ b/app/view/make/setting.sample.html @@ -350,10 +350,10 @@ web@@hp@@ trending_up@@support@@(Enty) +trending_up@@support@@(Pixiv FANBOX) list@@help@@/Docs(Constructing) GitHub Developer: Cutls@kirishima.cloud -@@sushi@@
Kyash

diff --git a/app/view/ps/index.html b/app/view/ps/index.html index 4d7f0704..4cc12d69 100644 --- a/app/view/ps/index.html +++ b/app/view/ps/index.html @@ -608,9 +608,9 @@ var tlid=0; crwdns475:0crwdne475:0 - - crwdns479:0crwdne479:0 - + + {{PixivSupport}} + crwdns476:0crwdne476:0 diff --git a/app/view/ps/setting.html b/app/view/ps/setting.html index f3dc8de6..6f63eb79 100644 --- a/app/view/ps/setting.html +++ b/app/view/ps/setting.html @@ -350,10 +350,10 @@ webcrwdns663:0crwdne663:0 trending_upcrwdns664:0crwdne664:0(Enty) +trending_upcrwdns664:0crwdne664:0(Pixiv FANBOX) listcrwdns665:0crwdne665:0/Docs(Constructing) GitHub Developer: Cutls@kirishima.cloud -crwdns666:0crwdne666:0
Kyash