TheDesk Akane (16.0.4)

app/js/tl/misskeyparse.js

@@ -152,6 +152,21 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					"pudding":"🍮"
 				}
 				var icon=reactions[toot.reaction];
+				var reactions=["like","love","laugh","hmm","surprise","congrats","angry","confused","pudding"];
+                for(var i=0;i<reactions.length;i++){
+                    if(toot.note.reactionCounts[reactions[i]]){
+                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(toot.note.reactionCounts[reactions[i]])
+                        $("#pub_" + id +" .re-"+reactions[i]).removeClass("hide")
+                    }else{
+                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(0)
+                        if($("#pub_" + id +" .reactions").hasClass("fullreact")){
+                            $("#pub_" + id +" .re-"+reactions[i]).addClass("hide")
+                        }else{
+                            $("#pub_" + id +" .re-"+reactions[i]).removeClass("hide")
+                        }
+                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(toot.note.reactionCounts[reactions[i]])
+                    }
+                }
 			}
 			var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.createdAt,
 				'absolute') + '('+lang_parse_notftime[lang]+')"><i class="fa fa-clock-o"></i>' + date(toot.createdAt,

app/js/tl/mix.js

@@ -114,21 +114,28 @@ function mixre(acct_id, tlid, TLtype, mute,delc) {
 
 		} else if (type == "update") {
 			var templete = parse([obj], '', acct_id, tlid,"",mute);
-			if (!$("#timeline_"+tlid+" [toot-id="+obj.id+"]").length) {
+			if($("#timeline_" + tlid +" [toot-id=" + obj.id + "]").length < 1){
+				if(voice){
+					say(obj.content)
+				}	
+				var templete = parse([obj], type, acct_id, tlid,"",mute);
 				var pool = localStorage.getItem("pool_" + tlid);
-				if (pool && templete) {
+				if (pool) {
 					pool = templete + pool;
-				} else if (templete) {
+				} else {
 					pool = templete
-				}else{
-					pool="";
 				}
 				localStorage.setItem("pool_" + tlid, pool);
+	
 				scrollck();
+	
 				additional(acct_id, tlid);
 				jQuery("time.timeago").timeago();
-				todc();
-		}}
+			}else{
+				todo("二重取得発生中");
+			}
+
+			}
 	}
 	websocketHome[wshid].onmessage = function(mess) {
 		console.log("Receive Streaming API:(Integrated:Home)");
@@ -154,19 +161,25 @@ function mixre(acct_id, tlid, TLtype, mute,delc) {
 					var templete="";
 				}
 			}
-		if (!$("#timeline_"+tlid+" [toot-id="+obj.id+"]").length) {
+			if($("#timeline_" + tlid +" [toot-id=" + obj.id + "]").length < 1){
+				if(voice){
+					say(obj.content)
+				}	
+				var templete = parse([obj], type, acct_id, tlid,"",mute);
 				var pool = localStorage.getItem("pool_" + tlid);
-				if (pool && templete) {
+				if (pool) {
 					pool = templete + pool;
-				} else if (templete) {
+				} else {
 					pool = templete
-				}else{
-					pool="";
 				}
 				localStorage.setItem("pool_" + tlid, pool);
+	
 				scrollck();
+	
 				additional(acct_id, tlid);
 				jQuery("time.timeago").timeago();
+			}else{
+				todo("二重取得発生中");
 			}
 		}
 	}

app/js/tl/notification.js

@@ -239,8 +239,29 @@ function notfmore(tlid) {
 
 //通知トグルボタン
 function notfToggle(acct, tlid) {
-	$("#notf-box_" + tlid).toggleClass("hide");
-	$("#notf-box_" + tlid).toggleClass("show");
+	if($("#notf-box_" + tlid).hasClass("column-hide")){
+		$("#notf-box_" + tlid).css("display","block")
+		$("#notf-box_" + tlid).animate({
+			'height': '400px'
+		},{
+			'duration': 300,
+			'complete': function(){
+				$("#notf-box_" + tlid).css("overflow-y","scroll")
+				$("#notf-box_" + tlid).removeClass("column-hide")
+			}
+		});
+	}else{
+		$("#notf-box_" + tlid).css("overflow-y","hidden")
+		$("#notf-box_" + tlid).animate({
+			'height': '0'
+		},{
+			'duration': 300,
+			'complete': function(){
+				$("#notf-box_" + tlid).addClass("column-hide")
+				$("#notf-box_" + tlid).css("display","none")
+			}
+		});
+	}
 	notfCanceler(acct)
 }
 function notfCanceler(acct){

app/js/tl/parse.js

@@ -549,9 +549,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'('+lang_parse_clickcopyurl[lang]+')"><i class="fa fa-clock-o"></i>' +
 			date(toot.created_at, datetype) + '</span>' +
 			'</div></div>' +
-			'<div class="area-toot"><span class="toot ' + spoiler + '">' + content +
-			'</span><span class="' +
+			'<div class="area-toot"><span class="' +
 			api_spoil + ' cw_text_' + toot.id + '">' + spoil + spoiler_show +
+			'</span><span class="toot ' + spoiler + '">' + content +
 			'</span>' +
 			'' + viewer + '' +
 			'</div><div class="area-additional"><span class="additional">' + analyze +
@@ -605,7 +605,6 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 
 //オブジェクトパーサー(ユーザーデータ)
 function userparse(obj, auth, acct_id, tlid, popup) {
-	console.log("notf-get")
 	//独自ロケール
 	var locale = localStorage.getItem("locale");
 	if(locale=="yes"){
@@ -616,6 +615,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 	Object.keys(obj).forEach(function(key) {
 		var toot = obj[key];
 		if(!toot.username){
+			var raw=toot;
 			toot=toot.account;
 			var notf=true;
 		}else{
@@ -637,10 +637,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 			ftxt = localStorage.getItem("follow_" + acct_id);
 		}
 		if(popup > 0 || popup==-1 || notf){
-			var notftext='<span class="cbadge" title="' + date(toot.created_at,
-				'absolute') + '('+lang_parse_notftime[lang]+')"><i class="fa fa-clock-o"></i>' + date(toot.created_at,
-				datetype) +
-			'</span>'+ftxt+'<br>';
+			var notftext=ftxt+'<br>';
 		}else{
 			var notftext="";
 		}

app/js/tl/tl.js

@@ -485,7 +485,11 @@ function cap(type, data, acct_id) {
 	} else if (type == "dm") {
 		var response= "DM"
 	} else if (type == "mix") {
-		var response= "Integrated"
+		if(localStorage.getItem("domain_" + acct_id)=="misskey.xyz"){
+			var response= "Social TL"
+		}else{
+			var response= "Integrated"
+		}
 	} else if (type == "plus") {
 		var response= "Local+"
 	}