TheDesk Airi (ver.8)

app/js/tl/datails.js

@@ -3,28 +3,6 @@ function details(id, acct_id, tlid) {
 	$(".toot-reset").html("データなし");
 	var html = $("#timeline_"+tlid+" #pub_" + id).html();
 	$("#toot-this").html(html);
-	if(!$("#timeline_"+tlid+" #pub_" + id).length){
-		console.log("API Using");
-		var domain = localStorage.getItem("domain_" + acct_id);
-		var at = localStorage.getItem(domain + "_at");
-		var start = "https://" + domain + "/api/v1/statuses/" + id;
-		fetch(start, {
-			method: 'GET',
-			headers: {
-				'content-type': 'application/json',
-				'Authorization': 'Bearer ' + at
-			},
-		}).then(function(response) {
-			return response.json();
-		}).catch(function(error) {
-			todo(error);
-			console.error(error);
-		}).then(function(json) {
-			var html = parse([json]);
-			$("#toot-this").html(html);
-			jQuery("time.timeago").timeago();
-		});
-	}
 	$('#tootmodal').modal('open');
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem(domain + "_at");
@@ -41,10 +19,20 @@ function details(id, acct_id, tlid) {
 		todo(error);
 		console.error(error);
 	}).then(function(json) {
+		if(!$("#timeline_"+tlid+" #pub_" + id).length){
+			var html = parse([json]);
+			$("#toot-this").html(html);
+			jQuery("time.timeago").timeago();
+		}
 		$("#toot-this .fav_ct").text(json.favourites_count);
 		$("#toot-this .rt_ct").text(json.reblogs_count);
 		$("#tootmodal").attr("data-url",json.url);
 		$("#tootmodal").attr("data-id",json.id);
+		if(json.account.acct==json.account.username){
+			$("#tootmodal").attr("data-user",json.account.acct+"@"+domain);
+		}else{
+			$("#tootmodal").attr("data-user",json.account.acct);
+		}
 		if (json.in_reply_to_id) {
 			replyTL(json.in_reply_to_id, acct_id);
 		}

app/js/tl/parse.js

@@ -306,19 +306,19 @@ function parse(obj, mix, acct_id, tlid, popup) {
 		var visen = toot.visibility;
 		if (visen == "public") {
 			var vis =
-				'<i class="text-darken-3 material-icons gray sml" title="公開">public</i>';
+				'<i class="text-darken-3 material-icons gray sml vis-data" title="公開" data-vis="public">public</i>';
 			var can_rt = "";
 		} else if (visen == "unlisted") {
 			var vis =
-				'<i class="text-darken-3 material-icons blue-text" title="未収載">lock_open</i>';
+				'<i class="text-darken-3 material-icons blue-text vis-data" title="未収載" data-vis="unlisted">lock_open</i>';
 			var can_rt = "";
 		} else if (visen == "plivate") {
 			var vis =
-				'<i class="text-darken-3 material-icons orange-text" title="非公開">lock</i>';
+				'<i class="text-darken-3 material-icons orange-text vis-data" title="非公開" data-vis="private">lock</i>';
 			var can_rt = "hide";
 		} else if (visen == "direct") {
 			var vis =
-				'<i class="text-darken-3 material-icons red-text" title="ダイレクト">mail</i>';
+				'<i class="text-darken-3 material-icons red-text vis-data" title="ダイレクト" data-vis="direct">mail</i>';
 			var can_rt = "hide";
 		}
 		if (toot.account.acct == localStorage.getItem("user_" + acct_id)) {

app/js/tl/tag.js

@@ -1,3 +1,12 @@
+//タグ表示
+if(location.search){
+	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
+	var mode=m[1];
+	var codex=m[2];
+	if(mode=="tag"){
+		tl('tag',decodeURI(codex),0,'add');
+	}
+}
 //よく使うタグ
 function tagShow(tag){
 	$("[data-tag="+tag+"]").toggleClass("hide");