TheDesk Miho (ver.14)

app/js/login/manager.js

@@ -302,6 +302,7 @@ function refresh(target) {
 		localStorage.setItem("user_" + target, json["acct"]);
 		localStorage.setItem("user-id_" + target, json["id"]);
 		console.log("user-id_" + target+":"+json["id"])
+		console.log(localStorage.getItem("user-id_"+target));
 		localStorage.setItem("prof_" + target, json["avatar"]);
 		obj[target] = ref;
 		console.log(obj);

app/js/platform/end.js

@@ -5,19 +5,22 @@
   	var url = $a.attr('href');
   	if (!url) {
   		var url = $a.parent().attr('href');
-  	}
-  	var urls = url.match(/https?:\/\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/);
-	//hrefがhttp/httpsならブラウザで
-  	if (urls[0]) {
-  		const {
-  			shell
-  		} = require('electron');
-
-  		shell.openExternal(url);
-  	} else {
-
-  		location.href = url;
-  	}
+	  }
+	  var urls=[];
+	  if(url){
+		urls = url.match(/https?:\/\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/);
+		//hrefがhttp/httpsならブラウザで
+		if (urls[0]) {
+			const {
+				shell
+			} = require('electron');
+  
+			shell.openExternal(url);
+		} else {
+  
+			location.href = url;
+		}
+	  }
   	return false;
   });
   

app/js/tl/datails.js

@@ -156,7 +156,9 @@ function cbCopy(mode){
 	if(mode=="emb"){
 		var emb='<iframe src="'+url+'/embed" class="mastodon-embed" style="max-width: 100%; border: 0" width="400"></iframe><script src="https://'+domain+'/embed.js" async="async"></script>';
 		execCopy(emb)
+		Materialize.toast("埋め込みHTMLをコピーしました", 1500);
 	}else{
 		execCopy(url)
+		Materialize.toast("トゥートURLをコピーしました", 1500);
 	}
 }

app/js/tl/notification.js

@@ -146,7 +146,7 @@ function parseNotf(obj, popup, tlid, acct_id) {
 				var emoji = toot.emojis[key5];
 				var shortcode = emoji.shortcode;
 				var emoji_url = '<img src="' + emoji.url +
-					'" style="width:2em" class="emoji-img">';
+					'" style="width:1em" class="emoji-img">';
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				content = content.replace(regExp, emoji_url);
 			});
@@ -229,13 +229,13 @@ function parseNotf(obj, popup, tlid, acct_id) {
 				'" class="cvo ' + fav_app + ' ' + rt_app +
 				'" style="padding-top:5px;" notf-id="' + eachobj.id + '">' +
 				'<span class="gray sharesta">' + noticetext +
-				'<br><span class="cbadge"><i class="fa fa-clock-o"></i>' + date(eachobj.created_at,
+				'<span class="cbadge right"><i class="fa fa-clock-o"></i>' + date(eachobj.created_at,
 					datetype) + '</span></span>' +
 				'<div style="padding:0; margin:0; width:400px; max-width:100%; display:flex; align-items:flex-end;">' +
 				'<div style="flex-basis:40px;"><a onclick="udg(\'' + toot.account.id +
 				'\',\'' + acct_id + '\');" user="' + toot.account.acct + '" class="udg">' +
 				'<img src="' + toot.account.avatar +
-				'" width="20" class="prof-img" user="' + toot.account.acct +
+				'" width="40" class="prof-img" user="' + toot.account.acct +
 				'"></a></div>' +
 				'<div style="flex-grow:3; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">' +
 				toot.account.display_name + '</div>' +

app/js/ui/layout.js

@@ -35,7 +35,7 @@
 				var acct = obj[key];
 				localStorage.setItem("name_" + key, acct.name);
 				localStorage.setItem("user_" + key, acct.user);
-				localStorage.setItem("user-id_" + key, acct.user);
+				localStorage.setItem("user-id_" + key, acct.id);
 				localStorage.setItem("prof_" + key, acct.prof);
 				localStorage.setItem("domain_" + key, acct.domain);
 				localStorage.setItem(acct.domain + "_at", acct.at);

app/js/userdata/his-data.js

@@ -311,12 +311,3 @@ function showDom(more, acct_id) {
 	});
 }
 
-//プロフ編集
-function profeditShow(json) {
-	$("#his-name-val").val(json.display_name);
-	var des = json.note;
-	des = des.replace(/<br \/>/g, "\n");
-	des = des.replace("<p>", "");
-	des = des.replace("</p>", "");
-	$("#his-des-val").val(des);
-}

app/js/userdata/showOnTL.js

@@ -60,7 +60,12 @@ function udg(user, acct_id) {
 			localStorage.setItem("history" , user);
 		}
 		//自分の時
-		if (json.acct == localStorage.getItem("user")) {
+		if (json.acct == localStorage.getItem("user_"+acct_id)) {
+			$("#his-name-val").val(json.display_name);
+			var des = json.note;
+			des = des.replace(/<br \/>/g, "\n")
+			des = $.strip_tags(des);
+			$("#his-des-val").val(des);
 			$("#his-follow-btn").hide();
 			$("#his-block-btn").hide();
 			$("#his-mute-btn").hide();
@@ -74,7 +79,6 @@ function udg(user, acct_id) {
 			showMut('', acct_id);
 			showDom('', acct_id);
 			showReq('', acct_id);
-			profeditShow(json);
 		} else {
 			relations(user, acct_id);
 		}