From a48419ef4236bf9a2d347177b52ff55268156b43 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Thu, 4 Apr 2019 11:20:24 +0900
Subject: [PATCH] =?UTF-8?q?API=E3=81=AE=E5=91=BC=E3=81=B3=E6=96=B9?=
 =?UTF-8?q?=E3=81=8C=E6=82=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=80=82=E3=83=A6=E3=83=BC=E3=82=B6=E5=88=A5?=
 =?UTF-8?q?=E3=83=8F=E3=83=83=E3=82=B7=E3=83=A5=E3=82=BF=E3=82=B0=E3=82=AB?=
 =?UTF-8?q?=E3=83=A9=E3=83=A0=E3=82=92=E7=94=A8=E6=84=8F=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/jp/juggler/subwaytooter/Column.kt    |  7 ++---
 .../subwaytooter/action/Action_HashTag.kt     | 26 +++++++++----------
 app/src/main/res/values-ja/strings.xml        |  2 ++
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/Column.kt b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
index 75ae1bb4..81deeaf3 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/Column.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
@@ -6402,7 +6402,7 @@ class Column(
 		return when(column_type) {
 			TYPE_HOME, TYPE_MISSKEY_HYBRID, TYPE_PROFILE, TYPE_NOTIFICATIONS, TYPE_LIST_TL -> true
 			TYPE_LOCAL, TYPE_FEDERATE, TYPE_HASHTAG, TYPE_SEARCH -> isMisskey
-			TYPE_HASHTAG_FROM_ACCT -> true
+			TYPE_HASHTAG_FROM_ACCT -> false
 			TYPE_CONVERSATION, TYPE_DIRECT_MESSAGES -> isMisskey
 			else -> false
 		}
@@ -6413,6 +6413,7 @@ class Column(
 		return when(column_type) {
 			TYPE_HOME, TYPE_MISSKEY_HYBRID, TYPE_PROFILE, TYPE_NOTIFICATIONS, TYPE_LIST_TL, TYPE_DIRECT_MESSAGES -> true
 			TYPE_LOCAL, TYPE_FEDERATE, TYPE_HASHTAG, TYPE_SEARCH -> isMisskey
+			TYPE_HASHTAG_FROM_ACCT -> true
 			else -> false
 		}
 	}
@@ -7131,9 +7132,9 @@ class Column(
 				profile_id = whoRef.get().id
 			}
 			
-			val sb = StringBuilder("/api/v1/accounts/${profile_id}/statuses?tagged=")
-				.append(hashtag.encodePercent())
+			val sb = StringBuilder("/api/v1/accounts/${profile_id}/statuses")
 				.append("?limit=").append(READ_LIMIT)
+				.append("&tagged=").append(hashtag.encodePercent())
 			
 			if(with_attachment) sb.append("&only_media=true")
 			if(instance_local) sb.append("&local=true")
diff --git a/app/src/main/java/jp/juggler/subwaytooter/action/Action_HashTag.kt b/app/src/main/java/jp/juggler/subwaytooter/action/Action_HashTag.kt
index bfea9237..bad6ea31 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/action/Action_HashTag.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/action/Action_HashTag.kt
@@ -37,19 +37,19 @@ object Action_HashTag {
 		
 		// https://mastodon.juggler.jp/@tateisu/101865456016473337
 		// 一時的に使えなくする
-//		if( whoAcct != null ){
-//			val(username,instance)=whoAcct.split('@')
-//			d.addAction(AcctColor.getStringWithNickname(activity, R.string.open_hashtag_from_account ,whoAcct)) {
-//				timelineOtherInstance(
-//					activity,
-//					pos,
-//					"https://${instance}/@${username}/tagged/${ tag_without_sharp.encodePercent()}",
-//					host,
-//					tag_without_sharp,
-//					whoAcct
-//				)
-//			}
-//		}
+		if( whoAcct != null ){
+			val(username,instance)=whoAcct.split('@')
+			d.addAction(AcctColor.getStringWithNickname(activity, R.string.open_hashtag_from_account ,whoAcct)) {
+				timelineOtherInstance(
+					activity,
+					pos,
+					"https://${instance}/@${username}/tagged/${ tag_without_sharp.encodePercent()}",
+					host,
+					tag_without_sharp,
+					whoAcct
+				)
+			}
+		}
 		
 		
 		d.addAction(activity.getString(R.string.open_in_browser)) {
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 5a692de9..33d115a1 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -886,5 +886,7 @@
     <string name="vote_button">投票</string>
     <string name="end_of_polling_from">%1$sの調査の終了</string>
     <string name="open_hashtag_from_account">(%1$sからの)ハッシュタグのカラムを開く</string>
+    <string name="hashtag_from_acct">Hashtag from account</string>
+    <string name="hashtag_of_from">Hashtag :#%1$s (%2$sから)</string>
 
 </resources>