From 2c16da21e09abafc3daa0b71499fa64d8de2020c Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Mon, 10 Feb 2020 21:41:33 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=82=B9=E3=83=88=E3=83=89=E3=83=B33.?=
 =?UTF-8?q?1.0=E4=BB=A5=E9=99=8D=E3=81=AE=E3=82=B5=E3=83=BC=E3=83=90?=
 =?UTF-8?q?=E3=81=AA=E3=82=89=E3=83=AA=E3=82=B9=E3=83=88=E3=83=A1=E3=83=B3?=
 =?UTF-8?q?=E3=83=90=E3=83=BC=E3=81=AB=E8=87=AA=E5=88=86=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=E3=81=A7=E3=81=8D=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subwaytooter/action/Action_ListMember.kt  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/action/Action_ListMember.kt b/app/src/main/java/jp/juggler/subwaytooter/action/Action_ListMember.kt
index cf09ff80..f4ce29f1 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/action/Action_ListMember.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/action/Action_ListMember.kt
@@ -5,10 +5,7 @@ import jp.juggler.subwaytooter.ActMain
 import jp.juggler.subwaytooter.App1
 import jp.juggler.subwaytooter.R
 import jp.juggler.subwaytooter.api.*
-import jp.juggler.subwaytooter.api.entity.EntityId
-import jp.juggler.subwaytooter.api.entity.TootAccount
-import jp.juggler.subwaytooter.api.entity.TootRelationShip
-import jp.juggler.subwaytooter.api.entity.parseItem
+import jp.juggler.subwaytooter.api.entity.*
 import jp.juggler.subwaytooter.dialog.DlgConfirm
 import jp.juggler.subwaytooter.table.SavedAccount
 import jp.juggler.util.*
@@ -17,7 +14,7 @@ import java.util.regex.Pattern
 
 object Action_ListMember {
 	
-	private val reFollowError ="follow".asciiPattern(Pattern.CASE_INSENSITIVE)
+	private val reFollowError = "follow".asciiPattern(Pattern.CASE_INSENSITIVE)
 	
 	interface Callback {
 		fun onListMemberUpdated(willRegistered : Boolean, bSuccess : Boolean)
@@ -31,10 +28,6 @@ object Action_ListMember {
 		bFollow : Boolean = false,
 		callback : Callback?
 	) {
-		if(access_info.isMe(local_who)) {
-			showToast(activity, false, R.string.it_is_you)
-			return
-		}
 		
 		TootTaskRunner(activity).run(access_info, object : TootTask {
 			override fun background(client : TootApiClient) : TootApiResult? {
@@ -56,8 +49,15 @@ object Action_ListMember {
 					)
 					// 204 no content
 				} else {
-					if(bFollow) {
-						
+					
+					val isMe = access_info.isMe(local_who)
+					if( isMe ) {
+						val (ti, ri) = TootInstance.get(client)
+						if(ti == null) return ri
+						if(! ti.versionGE(TootInstance.VERSION_3_1_0_rc1)) {
+							return TootApiResult(activity.getString(R.string.it_is_you))
+						}
+					}else if(bFollow) {
 						// リモートユーザの解決
 						if(! access_info.isLocalUser(local_who)) {
 							val (r2, ar) = client.syncAccountByAcct(access_info, local_who.acct)