From a636c745e41cf19a165a65d987d667cf8af6aac8 Mon Sep 17 00:00:00 2001
From: Cutls <web-pro@cutls.com>
Date: Thu, 9 May 2019 00:46:26 +0900
Subject: [PATCH] Add: follow request auth/reject

---
 app/js/tl/parse.js          | 12 +++++++-----
 app/js/userdata/his-data.js |  7 ++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js
index a4cd4452..680ca080 100644
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -872,6 +872,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 	var datetype = localStorage.getItem("datetype");
 	Object.keys(obj).forEach(function(key) {
 		var toot = obj[key];
+		console.log(toot)
 		if(!toot.username){
 			var raw=toot;
 			toot=toot.account;
@@ -885,10 +886,11 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 			var locked = "";
 		}
 		if (auth) {
-			var auth = '<i class="material-icons gray pointer" onclick="request(\'' +
-				toot.id + '\',\'authorize\',' + acct_id + ')">person_add</i>';
+			var authhtml = '<i class="material-icons gray pointer" onclick="request(\'' +
+				toot.id + '\',\'authorize\',' + acct_id + ')">person_add</i>　<i class="material-icons gray pointer" onclick="request(\'' +
+				toot.id + '\',\'reject\',' + acct_id + ')">person_add_disabled</i>';
 		} else {
-			var auth = "";
+			var authhtml = "";
 		}
 		var ftxt=lang.lang_parse_followed;
 		if(!locale && localStorage.getItem("followlocale_" + acct_id)){
@@ -974,13 +976,13 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 			'<div class="area-display_name"><div class="flex-name"><span class="user">' +
 			dis_name + '</span>' +
 			'<span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"> @' +
-			toot.acct + locked + auth +'</span>' +
+			toot.acct + locked  +'</span>' +
 			'</div>' +
 			'</div>' +
 			'<div style="justify-content:space-around" class="area-toot"> <div class="cbadge" style="width:100px;">Follows:' +
 			toot.following_count +
 			'</div><div class="cbadge" style="width:100px;">Followers:' + toot.followers_count +
-			'</div>' +
+			'</div>' + authhtml+
 			'</div>' +
 			'</div>' +
 			'</div>';
diff --git a/app/js/userdata/his-data.js b/app/js/userdata/his-data.js
index b83a6c60..3d936075 100644
--- a/app/js/userdata/his-data.js
+++ b/app/js/userdata/his-data.js
@@ -438,10 +438,11 @@ function showReq(more, acct_id) {
 		todo(error);
 		console.error(error);
 	}).then(function(json) {
-		if(localStorage.getItem("mode_" + domain)=="misskey"){
-			var templete = userparse(json, 'true',acct_id);
+		
+		if(localStorage.getItem("mode_" + domain)!="misskey"){
+			var templete = userparse(json, true,acct_id);
 		}else{
-			var templete = misskeyUserparse(json, 'true',acct_id);
+			var templete = misskeyUserparse(json, true,acct_id);
 		}
 		
 		if(!json[0]){