From b6e2e1b1c57bd166b1ac81f8fbc995674782fa46 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Wed, 9 Jan 2019 11:33:32 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E3=81=AE=E6=8A=95=E7=A8=BF=E5=8F=96=E5=BE=97=E6=99=82=E3=81=AB?=
 =?UTF-8?q?=E5=BF=85=E8=A6=81=E3=81=AA=E3=82=89exclude=5Freplies=E3=81=A8e?=
 =?UTF-8?q?xclude=5Freblogs=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E3=82=92=E4=BD=BF=E3=81=86=E3=80=82=E3=80=8C=E5=91=A8=E8=BE=BA?=
 =?UTF-8?q?=E3=81=AE=E3=82=A2=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88TL?=
 =?UTF-8?q?=E3=80=8D=E3=81=AE=E5=B7=AE=E5=88=86=E5=8F=96=E5=BE=97=E3=81=AE?=
 =?UTF-8?q?=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/jp/juggler/subwaytooter/Column.kt    | 58 ++++++-------------
 1 file changed, 17 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/Column.kt b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
index d9da464d..78265b8d 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/Column.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
@@ -84,8 +84,7 @@ class Column(
 		private const val PATH_LOCAL = "/api/v1/timelines/public?limit=$READ_LIMIT&local=true"
 		private const val PATH_TL_FEDERATE = "/api/v1/timelines/public?limit=$READ_LIMIT"
 		private const val PATH_FAVOURITES = "/api/v1/favourites?limit=$READ_LIMIT"
-		private const val PATH_ACCOUNT_STATUSES =
-			"/api/v1/accounts/%s/statuses?limit=$READ_LIMIT" // 1:account_id
+		
 		private const val PATH_LIST_TL = "/api/v1/timelines/list/%s?limit=$READ_LIMIT"
 		
 		// アカウントのリストを返すAPI
@@ -2622,13 +2621,7 @@ class Column(
 				// ↑のトゥートのアカウントのID
 				profile_id = target_status.account.id
 				
-				var path = String.format(
-					Locale.JAPAN,
-					PATH_ACCOUNT_STATUSES,
-					profile_id
-				)
-				if(with_attachment && ! with_highlight) path += "&only_media=1"
-				
+				val path = makeProfileStatusesUrl(profile_id)
 				idOld = null
 				idRecent = null
 				
@@ -2858,12 +2851,7 @@ class Column(
 											}
 										}
 										
-										var path = String.format(
-											Locale.JAPAN,
-											PATH_ACCOUNT_STATUSES,
-											profile_id
-										)
-										if(with_attachment && ! with_highlight) path += "&only_media=1"
+										val path = makeProfileStatusesUrl(profile_id)
 										
 										if(instance?.versionGE(TootInstance.VERSION_1_6) == true
 										// 将来的に正しく判定できる見込みがないので、Pleroma条件でのフィルタは行わない
@@ -3417,6 +3405,15 @@ class Column(
 		task.executeOnExecutor(App1.task_executor)
 	}
 	
+	// mastodon用
+	private fun makeProfileStatusesUrl(profile_id : EntityId?) : String {
+		var path ="/api/v1/accounts/$profile_id/statuses?limit=$READ_LIMIT"
+		if(with_attachment && ! with_highlight) path += "&only_media=1"
+		if(dont_show_boost) path += "&exclude_reblogs=1"
+		if(dont_show_reply) path += "&exclude_replies=1"
+		return path
+	}
+	
 	private var bMinIdMatched : Boolean = false
 	
 	private fun parseRange(
@@ -4784,19 +4781,11 @@ class Column(
 						}
 						
 						TYPE_ACCOUNT_AROUND -> {
-							var s = String.format(
-								Locale.JAPAN,
-								PATH_ACCOUNT_STATUSES,
-								profile_id
-							)
-							if(with_attachment && ! with_highlight) s += "&only_media=1"
-							getStatusList(client, s)
-							
+							val path = makeProfileStatusesUrl(profile_id)
 							if(bBottom) {
-								getStatusList(client, s)
+								getStatusList(client, path)
 							} else {
-								val rv =
-									getStatusList(client, s, aroundMin = true)
+								val rv = getStatusList(client, path, aroundMin = true)
 								list_tmp?.sortBy { it.getOrderId() }
 								list_tmp?.reverse()
 								rv
@@ -4884,13 +4873,7 @@ class Column(
 										misskeyParams = makeMisskeyParamsProfileStatuses(parser)
 									)
 								} else {
-									var s = String.format(
-										Locale.JAPAN,
-										PATH_ACCOUNT_STATUSES,
-										profile_id
-									)
-									if(with_attachment && ! with_highlight) s += "&only_media=1"
-									getStatusList(client, s)
+									getStatusList(client, makeProfileStatusesUrl(profile_id))
 								}
 							}
 						}
@@ -5976,14 +5959,7 @@ class Column(
 								if(access_info.isPseudo) {
 									client.request(PATH_INSTANCE)
 								} else {
-									var s =
-										String.format(
-											Locale.JAPAN,
-											PATH_ACCOUNT_STATUSES,
-											profile_id
-										)
-									if(with_attachment && ! with_highlight) s += "&only_media=1"
-									getStatusList(client, s)
+									getStatusList(client, makeProfileStatusesUrl(profile_id))
 								}
 							}
 						}