From 1ac79f21aee6421dc9cd7ae42ee755b8f6444158 Mon Sep 17 00:00:00 2001 From: cutls Date: Tue, 7 Aug 2018 00:14:55 +0900 Subject: [PATCH] Fav ct had had bugs yet. and fix some bugs...(TheDesk Akane (16.0.3)) --- app/js/login/instance.js | 17 ++++++++++++++++- app/js/login/login.js | 13 ++++++++++++- app/js/post/bb-md.js | 6 +++++- app/js/tl/datails.js | 1 + app/js/tl/misskeyparse.js | 4 ++-- app/js/tl/notification.js | 9 +++++---- app/js/tl/parse.js | 18 ++++++------------ 7 files changed, 47 insertions(+), 21 deletions(-) diff --git a/app/js/login/instance.js b/app/js/login/instance.js index 288f9446..02068ac5 100644 --- a/app/js/login/instance.js +++ b/app/js/login/instance.js @@ -40,6 +40,10 @@ var idata={ "imastodon.net_local":"楽屋", "imastodon.net_notification":"ホワイトボード", "imastodon.net_public":"ライブステージ", + "imastodon.net_post":"あふぅ", + "imastodon.net_fav":"の頭にティンときたようです", + "imastodon.net_bt":":「わかるわ」", + "imastodon.net_follow":"名刺をいただきました", "mstdn.osaka":"instance", "mstdn.osaka_name":"大阪丼", "mstdn.osaka_letters":"500", @@ -49,6 +53,10 @@ var idata={ "mstdn.osaka_local":"近所", "mstdn.osaka_notification":"あめちゃん", "mstdn.osaka_public":"新世界", + "mstdn.osaka_post":"なんや！", + "mstdn.osaka_fav":"がええやん言いました", + "mstdn.osaka_bt":"がしばいた", + "mstdn.osaka_follow":"ツルまれました", "mstdn.kemono-friends.info":"instance", "mstdn.kemono-friends.info_name":"ますとどんちほー", "mstdn.kemono-friends.info_letters":"1024", @@ -58,6 +66,9 @@ var idata={ "mstdn.kemono-friends.info_local":"ますとどんちほー", "mstdn.kemono-friends.info_notification":"ねえねえ!", "mstdn.kemono-friends.info_public":"ジャパリパーク", + "mstdn.kemono-friends.info_post":"がおー！", + "mstdn.kemono-friends.info_fav":":「すごーい」", + "mstdn.kemono-friends.info_bt":":「たーのしー」", "itabashi.0j0.jp":"instance", "itabashi.0j0.jp_name":"板橋丼", "itabashi.0j0.jp_letters":"1024", @@ -77,7 +88,11 @@ var idata={ "misskey.xyz_name":"Misskey", "misskey.xyz_letters":"1000", "misskey.xyz_bbcode":"disabled", - "misskey.xyz_markdown":"enabled" + "misskey.xyz_markdown":"enabled", + "misskey.xyz_public":"Global", + "misskey.xyz_post":"Post", + "imastodon.net_fav":" reacted your post.", + "imastodon.net_bt":" reposted your post.", }; localStorage.setItem("instance", JSON.stringify(idata)); diff --git a/app/js/login/login.js b/app/js/login/login.js index c120ac07..42520e4a 100644 --- a/app/js/login/login.js +++ b/app/js/login/login.js @@ -310,7 +310,18 @@ function ckdb(acct_id) { if(json[domain + "_notification"]){ localStorage.setItem("notification_" + acct_id, json[domain + "_notification"]); } - + if(json[domain + "_post"]){ + localStorage.setItem("post_" + acct_id, json[domain + "_post"]); + } + if(json[domain + "_fav"]){ + localStorage.setItem("fav_" + acct_id, json[domain + "_fav"]); + } + if(json[domain + "_bt"]){ + localStorage.setItem("bt_" + acct_id, json[domain + "_bt"]); + } + if(json[domain + "_follow"]){ + localStorage.setItem("follow_" + acct_id, json[domain + "_follow"]); + } } } diff --git a/app/js/post/bb-md.js b/app/js/post/bb-md.js index c9b9c7f0..823622db 100644 --- a/app/js/post/bb-md.js +++ b/app/js/post/bb-md.js @@ -4,7 +4,11 @@ function mdCheck(){ var acct_id = $("#post-acct-sel").val(); var profimg=localStorage.getItem("prof_"+acct_id); $("#acct-sel-prof").attr("src",profimg); - $("#toot-post-btn").text(lang_toot[lang]+"("+localStorage.getItem("domain_"+acct_id)+")"); + if(localStorage.getItem("post_" + acct_id)){ + $("#toot-post-btn").text(localStorage.getItem("post_" + acct_id)+"("+localStorage.getItem("domain_"+acct_id)+")"); + }else{ + $("#toot-post-btn").text(lang_toot[lang]+"("+localStorage.getItem("domain_"+acct_id)+")"); + } if(!localStorage.getItem("bb_"+acct_id) && !localStorage.getItem("md_"+acct_id)){ $(".markdown").addClass("hide"); $(".anti-markdown").addClass("hide"); diff --git a/app/js/tl/datails.js b/app/js/tl/datails.js index dcfe6f1e..6a09c1a5 100644 --- a/app/js/tl/datails.js +++ b/app/js/tl/datails.js @@ -190,6 +190,7 @@ function context(id, acct_id) { console.error(error); }).then(function(json) { if(domain=="misskey.xyz"){ + json.reverse(); console.log(json); var templete = misskeyParse(json, '', acct_id,"","",[]); $("#toot-reply").html(templete); diff --git a/app/js/tl/misskeyparse.js b/app/js/tl/misskeyparse.js index 12f1bfa8..14c09353 100644 --- a/app/js/tl/misskeyparse.js +++ b/app/js/tl/misskeyparse.js @@ -131,7 +131,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) { if (mix == "notf") { if (toot.type == "reply") { var what = lang_parse_mentioned[lang]; - var icon = ''; + var icon = ''; } else if (toot.type == "renote") { var what = lang_misskeyparse_renoted[lang]; var icon = ''; @@ -326,7 +326,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) { content=content.replace(/(.+)<\/motion>/gi, '$1') content=content.replace(/\*\*\*([^*]+)\*\*\*/gi, '$1') content=content.replace(/\*\*([^*]+)\*\*/gi, '$1') - content=content.replace(/^(.+)\s検索$/gmi, '
search
') + content=content.replace(/^(.+)\s(検索|search)$/gmi, '
search
') content=content.replace(/\[(.+)\]\($1'); content=twemoji.parse(content); diff --git a/app/js/tl/notification.js b/app/js/tl/notification.js index 9cc35755..bb34093a 100644 --- a/app/js/tl/notification.js +++ b/app/js/tl/notification.js @@ -245,20 +245,21 @@ function notfToggle(acct, tlid) { } function notfCanceler(acct){ $(".notf-reply_" + acct).text(0); - localStorage.removeItem("notf-reply_" + acct_id) + localStorage.removeItem("notf-reply_" + acct) $(".notf-reply_" + acct).addClass("hide"); $(".notf-fav_" + acct).text(0); - localStorage.removeItem("notf-fav_" + acct_id) + localStorage.removeItem("notf-fav_" + acct) $(".notf-fav_" + acct).addClass("hide"); $(".notf-bt_" + acct).text(0); - localStorage.removeItem("notf-bt_" + acct_id) + localStorage.removeItem("notf-bt_" + acct) $(".notf-bt_" + acct).addClass("hide"); $(".notf-follow_" + acct).text(0); - localStorage.removeItem("notf-follow_" + acct_id) + localStorage.removeItem("notf-follow_" + acct) $(".notf-follow_" + acct).addClass("hide"); $(".notf-icon_" + acct).removeClass("red-text"); } function allNotfRead(){ + console.log(localStorage.getItem("notf-fav_2")); var multi = localStorage.getItem("multi"); if (!multi) { var obj = [{ diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index ae23df7a..a988d838 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -157,18 +157,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) { } else if (toot.type == "reblog") { var what = lang_parse_bted[lang]; var icon = "fa-retweet light-blue-text"; - if(localStorage.getItem("domain_" + acct_id)=="imastodon.net" && !locale){ - what = ":「わかるわ」"; - }else if(localStorage.getItem("domain_" + acct_id)=="mstdn.osaka" && !locale){ - what = "がしばきました"; + if(!locale && localStorage.getItem("bt_" + acct_id)){ + what = localStorage.getItem("bt_" + acct_id); } } else if (toot.type == "favourite") { var what = lang_parse_faved[lang]; var icon = "fa-star yellow-text"; - if(localStorage.getItem("domain_" + acct_id)=="imastodon.net" && !locale){ - what = "の頭にティンときたようです"; - }else if(localStorage.getItem("domain_" + acct_id)=="mstdn.osaka" && !locale){ - what = "がええやんと言いました"; + if(!locale && localStorage.getItem("fav_" + acct_id)){ + what = localStorage.getItem("fav_" + acct_id); } } var noticetext = ' 0 || popup==-1 || notf){ var notftext='