diff --git a/app/css/tl.css b/app/css/tl.css
index 04fbd169..bd809a84 100644
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -334,6 +334,7 @@ p:not(:last-child){
.notice-box {
top: 0;
background-color:var(--notfbox);
+ filter: brightness(110%);
position: relative;
margin-right: 10px;
width:100%;
diff --git a/app/css/userdata.css b/app/css/userdata.css
index b6b82986..2729a29d 100644
--- a/app/css/userdata.css
+++ b/app/css/userdata.css
@@ -45,6 +45,7 @@
height:1.5rem; padding:0; background-color:#757575; text-align:center;
padding:5px;
margin-bottom:1px;
+ width:30%;
}
.his-field-content{
height:1.5rem; padding:0; padding-left:5px;
diff --git a/app/js/lang/lang.en.js b/app/js/lang/lang.en.js
index 37320ed2..23bb980c 100644
--- a/app/js/lang/lang.en.js
+++ b/app/js/lang/lang.en.js
@@ -148,6 +148,7 @@ var lang={
"lang_showontl_notf":"Notification ",
"lang_showontl_domain":"Domain ",
"lang_showontl_listwarn":"Follow to add this user to lists.",
+ "lang_showontl_verified":"This website is verified by owner at ",
//parse
"lang_parse_mentioned":" replied to you",
"lang_parse_faved":" favourited your toot",
diff --git a/app/js/lang/lang.ja.js b/app/js/lang/lang.ja.js
index ba51e9ad..41a852b0 100644
--- a/app/js/lang/lang.ja.js
+++ b/app/js/lang/lang.ja.js
@@ -150,6 +150,7 @@ var lang={
"lang_showontl_notf":"通知",
"lang_showontl_domain":"ドメイン",
"lang_showontl_listwarn":"リストに追加するためにはフォローが必要です。",
+ "lang_showontl_verified":"このユーザーの所持するWebサイトであると証明されています。",
//parse
"lang_parse_mentioned":"が返信しました",
"lang_parse_faved":"がお気に入り登録しました",
diff --git a/app/js/platform/end.js b/app/js/platform/end.js
index ac852838..9d18fe07 100644
--- a/app/js/platform/end.js
+++ b/app/js/platform/end.js
@@ -19,7 +19,7 @@
//メンションっぽかったら
var ats=[];
ats = url.match(
- /https:\/\/([-a-zA-Z0-9@.]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#]+)/
+ /https:\/\/([-a-zA-Z0-9.]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#@]+)/
);
console.log(toot);
if(toot){
@@ -41,7 +41,8 @@
}else if(ats){
console.log(ats);
if(ats[2]){
- if(ats[1]!="quesdon.rinsuki.net"){
+ //Quesdon判定
+ if(!~ats[2].indexOf("@")){
udgEx(ats[2]+"@"+ats[1],"main");
return false
}else{
diff --git a/app/js/userdata/showOnTL.js b/app/js/userdata/showOnTL.js
index 4b8728d8..a697ba3e 100644
--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@@ -117,7 +117,7 @@ function udg(user, acct_id) {
var emoji = json.emojis[key5];
var shortcode = emoji.shortcode;
var emoji_url = '
';
+ '" class="emoji-img" data-emoji="'+shortcode+'" draggable="false">';
var regExp = new RegExp(":" + shortcode + ":", "g");
dis_name = dis_name.replace(regExp, emoji_url);
note = note.replace(regExp, emoji_url);
@@ -143,8 +143,15 @@ function udg(user, acct_id) {
for(var i=0;i'+fname+' | '+fval+' | ';
+ note=note+'| '+fname+' | '+fval+' |
';
}
note=note+''
$("#his-des").html(twemoji.parse(note));
diff --git a/app/package.json b/app/package.json
index 3756ab1d..e6174445 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
{
"name": "thedesk",
- "version": "18.1.0",
+ "version": "18.1.2",
"description": "TheDesk is a Mastodon client for PC.",
"main": "main.js",
"scripts": {
diff --git a/app/view/en/index.html b/app/view/en/index.html
index 1e74ba50..966c8e5e 100644
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
@@ -360,7 +360,6 @@ var tlid=0;
+