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 @@
投票
%1$sの調査の終了
(%1$sからの)ハッシュタグのカラムを開く
+ Hashtag from account
+ Hashtag :#%1$s (%2$sから)