From f30749d752ea2e7b4c997fe1c288efa00bdb4829 Mon Sep 17 00:00:00 2001
From: cutls <web-pro@cutls.com>
Date: Fri, 13 Dec 2019 02:07:33 +0900
Subject: [PATCH] Fix: unvisible leading choice when shared polls

---
 app/css/tl.css            | 3 ++-
 app/js/tl/notification.js | 8 ++++----
 app/js/tl/parse.js        | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/css/tl.css b/app/css/tl.css
index 5f340930..eda1a603 100644
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -705,7 +705,8 @@ p:not(:last-child) {
 	position: relative;
 }
 .maxVoter {
-	background-color: var(--shared);
+	background-color: var(--emphasized);
+	filter: brightness(120%);
 }
 .ownMark img {
 	width: 1.2rem !important;
diff --git a/app/js/tl/notification.js b/app/js/tl/notification.js
index a9393eae..b3358c41 100644
--- a/app/js/tl/notification.js
+++ b/app/js/tl/notification.js
@@ -80,7 +80,7 @@ function notfColumn(acct_id, tlid, sys) {
 						if (misskey) {
 							templete = templete + misskeyUserparse([obj], 'notf', acct_id, tlid, -1, mute)
 						} else {
-							templete = templete + userparse([obj.account], 'notf', acct_id, tlid, -1)
+							templete = templete + userparse([obj.account], obj.type, acct_id, tlid, -1)
 						}
 					}
 				})
@@ -191,7 +191,7 @@ function notfCommon(acct_id, tlid, sys) {
 						if (misskey) {
 							templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
 						} else {
-							templete = templete + userparse([obj.account], type, acct_id, 'notf', -1)
+							templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
 						}
 					}
 				})
@@ -240,7 +240,7 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
 					if (obj.type != 'follow') {
 						templete = parse([obj], 'notf', acct_id, 'notf', popup)
 					} else {
-						templete = userparse([obj], 'notf', acct_id, 'notf', popup)
+						templete = userparse([obj], obj.type, acct_id, 'notf', popup)
 					}
 					if (!$('div[data-notfIndv=' + acct_id + '_' + obj.id + ']').length) {
 						$('div[data-notf=' + acct_id + ']').prepend(templete)
@@ -340,7 +340,7 @@ function notfmore(tlid) {
 							if (misskey) {
 								templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
 							} else {
-								templete = templete + userparse([obj.account], 'notf', acct_id, 'notf', -1)
+								templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
 							}
 						}
 					})
diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js
index f9a62a83..0d871a69 100644
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -1175,6 +1175,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				} else if (auth == 'moved') {
 					var ftxt = lang.lang_parse_moved
 				} 
+				console.log(auth, ftxt)
 				if (popup > 0 || popup == -1 || notf) {
 					var notftext = ftxt + '<br>'
 				} else {