From 69d60a73724895169b94c3aacc8ecdfd9faf9bbe Mon Sep 17 00:00:00 2001
From: cutls <web-pro@cutls.com>
Date: Mon, 7 Sep 2020 19:06:57 +0900
Subject: [PATCH] I8d TL streaming

---
 app/css/tl.css      | 7 +++++++
 app/js/tl/mix.js    | 6 +++---
 app/js/ui/layout.js | 2 --
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/css/tl.css b/app/css/tl.css
index dc1b07a4..7c3166fb 100644
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -451,6 +451,13 @@ iframe,
 .action .fa-quote-right {
 	margin-top: 0.15rem;
 }
+.actct {
+	color: var(--beforehover);
+}
+.actct:hover {
+	color: var(--color);
+	transition: 0.5s;
+}
 .contextMenu.dropdown-content {
 	padding-top: 5px;
 	overflow-y: hidden;
diff --git a/app/js/tl/mix.js b/app/js/tl/mix.js
index bb990187..20ff99f9 100644
--- a/app/js/tl/mix.js
+++ b/app/js/tl/mix.js
@@ -19,11 +19,11 @@ async function mixtl(acct_id, tlid, type, delc, voice) {
 	additional(acct_id, tlid)
 	jQuery('time.timeago').timeago()
 	todc()
-	if(mastodonBaseWsStatus[domain] == 'cannnotopen') {
+	if(mastodonBaseWsStatus[domain] == 'cannotuse') {
 		mixre(acct_id, tlid, 'mix', mute, voice, '')
-	} else if(mastodonBaseWs[domain] == 'undetected') {
+	} else if (mastodonBaseWsStatus[domain] == 'undetected' || mastodonBaseWsStatus[domain] == 'connecting') {
 		const mbws = setInterval(function () {
-			if(mastodonBaseWsStatus[domain] == 'cannnotopen') {
+			if(mastodonBaseWsStatus[domain] == 'cannotuse') {
 				mixre(acct_id, tlid, 'mix', mute, voice, '')
 				clearInterval(mbws)
 			} else if(mastodonBaseWsStatus[domain] == 'available') {
diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js
index abcca548..428d96c6 100644
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -149,7 +149,6 @@ function parseColumn(target, dontclose) {
 				icnsert = ' style="color: #' + ichex + '" '
 			}
 		}
-		console.log(acct)
 		if (acctlist[acct.domain]) {
 			if (acctlist[acct.domain].background != 'def') {
 				insert = insert + ' border-bottom:medium solid #' + acctlist[acct.domain].background + ';'
@@ -363,7 +362,6 @@ function parseColumn(target, dontclose) {
 				var addHeight = ''
 			}
 			if (acct.type != 'pub' && acct.type != 'pub-media') {
-				console.log(acct.type, key)
 				var mediaFil = `<a onclick="mediaToggle('${key}')" class="setting nex">
 					<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>
 					<span id="sta-media-${key}">On</span>