diff --git a/app/js/tl/notification.js b/app/js/tl/notification.js index 288c16fa..a9393eae 100644 --- a/app/js/tl/notification.js +++ b/app/js/tl/notification.js @@ -180,7 +180,8 @@ function notfCommon(acct_id, tlid, sys) { var n = new Notification('TheDesk:' + domain, options) } var mute = getFilterTypeByAcct(acct_id, 'notif') - if (obj.type != 'follow') { + //Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ + if (obj.type != 'follow' && obj.type != 'move') { if (misskey) { templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute) } else { @@ -190,7 +191,7 @@ function notfCommon(acct_id, tlid, sys) { if (misskey) { templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute) } else { - templete = templete + userparse([obj.account], 'notf', acct_id, 'notf', -1) + templete = templete + userparse([obj.account], type, acct_id, 'notf', -1) } } }) diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index 718bb984..f9a62a83 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -1085,28 +1085,28 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { ${lang.lang_parse_clientop}
-
-
- @@ -1167,10 +1167,14 @@ function userparse(obj, auth, acct_id, tlid, popup) { } else { var authhtml = '' } - var ftxt = lang.lang_parse_followed - if (!locale && localStorage.getItem('followlocale_' + acct_id)) { - ftxt = localStorage.getItem('followlocale_' + acct_id) - } + if (auth == 'follow') { + var ftxt = lang.lang_parse_followed + if (!locale && localStorage.getItem('followlocale_' + acct_id)) { + ftxt = localStorage.getItem('followlocale_' + acct_id) + } + } else if (auth == 'moved') { + var ftxt = lang.lang_parse_moved + } if (popup > 0 || popup == -1 || notf) { var notftext = ftxt + '
' } else { diff --git a/app/view/make/language/en/main.json b/app/view/make/language/en/main.json index c1ec7cb1..9cd730b3 100644 --- a/app/view/make/language/en/main.json +++ b/app/view/make/language/en/main.json @@ -193,6 +193,7 @@ "lang_parse_detail": "Details", "lang_parse_redraft": "Delete & re-draft", "lang_parse_followed": "Followed you", + "lang_parse_moved": "Moved to...", "lang_parse_clientop": "Operation of this client", "lang_parse_clienttxt": " will be", "lang_parse_clientno": "done nothing", diff --git a/app/view/make/language/ja-KS/main.json b/app/view/make/language/ja-KS/main.json index 3a21b2e6..ae1a6e5a 100644 --- a/app/view/make/language/ja-KS/main.json +++ b/app/view/make/language/ja-KS/main.json @@ -193,6 +193,7 @@ "lang_parse_det": "詳細(メインアカウント経由)", "lang_parse_redraft": "このトゥートを削除して再編集", "lang_parse_followed": "フォローしてもろた。", + "lang_parse_moved": "他のサーバー行ったで", "lang_parse_clientop": "クライアント操作", "lang_parse_clienttxt": " どうする?", "lang_parse_clientno": "何もせえへん", diff --git a/app/view/make/language/ja/main.json b/app/view/make/language/ja/main.json index 43e2b59f..7efb8ca1 100644 --- a/app/view/make/language/ja/main.json +++ b/app/view/make/language/ja/main.json @@ -193,6 +193,7 @@ "lang_parse_det": "詳細(メインアカウント経由)", "lang_parse_redraft": "削除して再編集", "lang_parse_followed": "フォローされました。", + "lang_parse_moved": "引っ越ししました。", "lang_parse_clientop": "クライアント操作", "lang_parse_clienttxt": " に対する処理を選択してください。", "lang_parse_clientno": "何もしない",