From ede2a81d827b57a3cd4e8f040a08b24ad8f0dc86 Mon Sep 17 00:00:00 2001 From: tateisu Date: Wed, 31 Mar 2021 16:48:13 +0900 Subject: [PATCH] =?UTF-8?q?=E5=BE=A9=E6=B4=BB=E3=81=97=E3=81=9F=E3=83=9E?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=83=89=E3=83=B3=E6=A4=9C=E7=B4=A2=E3=83=9D?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E3=83=AB=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/jp/juggler/subwaytooter/SideMenuAdapter.kt | 5 ++++- .../main/java/jp/juggler/subwaytooter/search/MspHelper.kt | 4 ++-- app/src/main/res/raw/search_desc_msp_en.txt | 2 +- app/src/main/res/raw/search_desc_msp_ja.txt | 2 +- app/src/main/res/values/strings.xml | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/jp/juggler/subwaytooter/SideMenuAdapter.kt b/app/src/main/java/jp/juggler/subwaytooter/SideMenuAdapter.kt index 789bcaf6..f8d7ef0a 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/SideMenuAdapter.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/SideMenuAdapter.kt @@ -308,7 +308,10 @@ class SideMenuAdapter( Item(), Item(title = R.string.toot_search), - + + Item(icon = R.drawable.ic_search, title = R.string.mastodon_search_portal) { + addColumn(defaultInsertPosition, SavedAccount.na, ColumnType.SEARCH_MSP, "") + }, Item(icon = R.drawable.ic_search, title = R.string.tootsearch) { addColumn(defaultInsertPosition, SavedAccount.na, ColumnType.SEARCH_TS, "") }, diff --git a/app/src/main/java/jp/juggler/subwaytooter/search/MspHelper.kt b/app/src/main/java/jp/juggler/subwaytooter/search/MspHelper.kt index 135a50f4..63c39f64 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/search/MspHelper.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/search/MspHelper.kt @@ -11,8 +11,8 @@ import jp.juggler.util.* import okhttp3.Request object MspHelper { - private const val mspTokenUrl = "http://mastodonsearch.jp/api/v1.0.1/utoken" - private const val mspSearchUrl = "http://mastodonsearch.jp/api/v1.0.1/cross" + private const val mspTokenUrl = "https://msearch.fediverse.media/api/v1.0.1/utoken" + private const val mspSearchUrl = "https://msearch.fediverse.media/api/v1.0.1/cross" private const val mspApiKey = "e53de7f66130208f62d1808672bf6320523dcd0873dc69bc" // 検索結果からページネーション用IDを抽出する diff --git a/app/src/main/res/raw/search_desc_msp_en.txt b/app/src/main/res/raw/search_desc_msp_en.txt index 2a5fe2ad..4a8f06e5 100644 --- a/app/src/main/res/raw/search_desc_msp_en.txt +++ b/app/src/main/res/raw/search_desc_msp_en.txt @@ -1 +1 @@ -powered by Mastodon Search Portal, it indexes toots of instances in Japan.
If you want to remove your toot from search result, please contact to @mastodonsearch@mstdn.jp. \ No newline at end of file +powered by Mastodon Search Portal, it indexes toots of instances in Japan.
If you want to remove your toot from search result, please contact to @izwx@geeks.cafe. \ No newline at end of file diff --git a/app/src/main/res/raw/search_desc_msp_ja.txt b/app/src/main/res/raw/search_desc_msp_ja.txt index 81976390..b17007bc 100644 --- a/app/src/main/res/raw/search_desc_msp_ja.txt +++ b/app/src/main/res/raw/search_desc_msp_ja.txt @@ -1 +1 @@ -powered by マストドン検索ポータル
検索結果からあなたのトゥートを除外したい場合、@mastodonsearch@mstdn.jpに連絡してください。 \ No newline at end of file +powered by マストドン検索ポータル.
検索結果からあなたのトゥートを除外したい場合、@izwx@geeks.cafeに連絡してください。 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c62fcd81..279e2897 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -403,7 +403,7 @@ Toot search (MSP) Toot search (ts) notestock search - MSP (JP) + Mastodon search portal(JP) Account/hashtag search using Mastodon API. Toot search \"%1$s\" Toot search (MSP) \"%1$s\"