2018-01-04 19:52:25 +01:00
|
|
|
|
package jp.juggler.subwaytooter.api
|
|
|
|
|
|
|
|
|
|
import android.content.Context
|
2018-01-12 10:01:25 +01:00
|
|
|
|
import android.content.SharedPreferences
|
2018-08-19 06:19:33 +02:00
|
|
|
|
import jp.juggler.subwaytooter.*
|
2018-11-27 17:53:27 +01:00
|
|
|
|
import jp.juggler.subwaytooter.api.entity.*
|
2018-10-07 19:57:19 +02:00
|
|
|
|
import jp.juggler.subwaytooter.table.ClientInfo
|
|
|
|
|
import jp.juggler.subwaytooter.table.SavedAccount
|
2018-01-12 10:01:25 +01:00
|
|
|
|
import jp.juggler.subwaytooter.util.*
|
2018-12-01 00:02:18 +01:00
|
|
|
|
import jp.juggler.util.*
|
2018-01-12 10:01:25 +01:00
|
|
|
|
import okhttp3.*
|
2018-01-04 19:52:25 +01:00
|
|
|
|
import org.json.JSONArray
|
2018-10-07 19:57:19 +02:00
|
|
|
|
import org.json.JSONException
|
|
|
|
|
import org.json.JSONObject
|
2018-08-28 14:25:45 +02:00
|
|
|
|
import java.util.*
|
2018-01-12 10:01:25 +01:00
|
|
|
|
import java.util.regex.Pattern
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
|
|
|
|
class TootApiClient(
|
2018-01-12 10:01:25 +01:00
|
|
|
|
internal val context : Context,
|
2018-03-18 06:42:44 +01:00
|
|
|
|
internal val httpClient : SimpleHttpClient = SimpleHttpClientImpl(
|
|
|
|
|
context,
|
2018-09-01 02:49:57 +02:00
|
|
|
|
App1.ok_http_client
|
2018-03-18 06:42:44 +01:00
|
|
|
|
),
|
2018-01-12 10:01:25 +01:00
|
|
|
|
internal val callback : TootApiCallback
|
2018-01-04 19:52:25 +01:00
|
|
|
|
) {
|
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
// 認証に関する設定を保存する
|
|
|
|
|
internal val pref : SharedPreferences
|
|
|
|
|
|
|
|
|
|
// インスタンスのホスト名
|
|
|
|
|
var instance : String? = null
|
|
|
|
|
|
|
|
|
|
// アカウントがある場合に使用する
|
|
|
|
|
var account : SavedAccount? = null
|
|
|
|
|
set(value) {
|
|
|
|
|
instance = value?.host
|
|
|
|
|
field = value
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var currentCallCallback : CurrentCallCallback?
|
|
|
|
|
get() = httpClient.currentCallCallback
|
|
|
|
|
set(value) {
|
|
|
|
|
httpClient.currentCallCallback = value
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
init {
|
|
|
|
|
pref = Pref.pref(context)
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-04 19:52:25 +01:00
|
|
|
|
companion object {
|
|
|
|
|
private val log = LogCategory("TootApiClient")
|
|
|
|
|
|
|
|
|
|
private const val DEFAULT_CLIENT_NAME = "SubwayTooter"
|
2018-01-12 10:01:25 +01:00
|
|
|
|
internal const val KEY_CLIENT_CREDENTIAL = "SubwayTooterClientCredential"
|
2018-05-11 15:42:54 +02:00
|
|
|
|
internal const val KEY_CLIENT_SCOPE = "SubwayTooterClientScope"
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
|
|
|
|
private const val KEY_AUTH_VERSION = "SubwayTooterAuthVersion"
|
2018-05-11 15:42:54 +02:00
|
|
|
|
private const val AUTH_VERSION = 3
|
2018-01-04 19:52:25 +01:00
|
|
|
|
private const val REDIRECT_URL = "subwaytooter://oauth/"
|
|
|
|
|
|
2018-08-19 06:19:33 +02:00
|
|
|
|
const val KEY_IS_MISSKEY = "isMisskey"
|
2018-08-20 19:37:42 +02:00
|
|
|
|
const val KEY_MISSKEY_APP_SECRET = "secret"
|
2018-08-19 06:19:33 +02:00
|
|
|
|
const val KEY_API_KEY_MISSKEY = "apiKeyMisskey"
|
2018-11-03 15:21:42 +01:00
|
|
|
|
const val KEY_USER_ID = "userId"
|
2018-08-19 06:19:33 +02:00
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
private const val NO_INFORMATION = "(no information)"
|
|
|
|
|
|
|
|
|
|
private val reStartJsonArray = Pattern.compile("\\A\\s*\\[")
|
|
|
|
|
private val reStartJsonObject = Pattern.compile("\\A\\s*\\{")
|
2018-01-17 18:39:16 +01:00
|
|
|
|
private val reWhiteSpace = Pattern.compile("\\s+")
|
2018-01-12 10:01:25 +01:00
|
|
|
|
|
2018-01-21 13:46:36 +01:00
|
|
|
|
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 mspApiKey = "e53de7f66130208f62d1808672bf6320523dcd0873dc69bc"
|
2018-01-17 18:39:16 +01:00
|
|
|
|
|
2018-08-18 12:58:14 +02:00
|
|
|
|
fun getMspMaxId(array : JSONArray, old : String?) : String? {
|
2018-01-12 10:01:25 +01:00
|
|
|
|
// max_id の更新
|
|
|
|
|
val size = array.length()
|
|
|
|
|
if(size > 0) {
|
|
|
|
|
val item = array.optJSONObject(size - 1)
|
|
|
|
|
if(item != null) {
|
|
|
|
|
val sv = item.optString("msp_id")
|
|
|
|
|
if(sv?.isNotEmpty() == true) return sv
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-08-18 12:58:14 +02:00
|
|
|
|
// MSPでは終端は分からず、何度もリトライする
|
|
|
|
|
return old
|
2018-01-12 10:01:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fun getTootsearchHits(root : JSONObject) : JSONArray? {
|
|
|
|
|
val hits = root.optJSONObject("hits")
|
|
|
|
|
return hits?.optJSONArray("hits")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// returns the number for "from" parameter of next page.
|
2018-08-18 12:58:14 +02:00
|
|
|
|
// returns null if no more next page.
|
|
|
|
|
fun getTootsearchMaxId(root : JSONObject, old : Long?) : Long? {
|
|
|
|
|
val size = getTootsearchHits(root)?.length() ?: 0
|
|
|
|
|
return when {
|
|
|
|
|
size <= 0 -> null
|
|
|
|
|
else -> (old ?: 0L) + size.toLong()
|
2018-01-12 10:01:25 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-11-27 17:53:27 +01:00
|
|
|
|
val DEFAULT_JSON_ERROR_PARSER = { json : JSONObject ->
|
|
|
|
|
val v = json.opt("error")
|
|
|
|
|
when(v) {
|
2018-11-27 18:42:55 +01:00
|
|
|
|
null, JSONObject.NULL -> null
|
2018-11-27 17:53:27 +01:00
|
|
|
|
else -> v.toString()
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-01-12 10:01:25 +01:00
|
|
|
|
|
|
|
|
|
internal fun simplifyErrorHtml(
|
|
|
|
|
response : Response,
|
|
|
|
|
sv : String,
|
|
|
|
|
jsonErrorParser : (json : JSONObject) -> String? = DEFAULT_JSON_ERROR_PARSER
|
|
|
|
|
) : String {
|
|
|
|
|
|
|
|
|
|
// JSONObjectとして解釈できるならエラーメッセージを検出する
|
|
|
|
|
try {
|
2018-01-21 13:46:36 +01:00
|
|
|
|
val error_message = jsonErrorParser(sv.toJsonObject())
|
2018-01-12 10:01:25 +01:00
|
|
|
|
if(error_message?.isNotEmpty() == true) {
|
|
|
|
|
return error_message
|
|
|
|
|
}
|
|
|
|
|
} catch(ex : Throwable) {
|
|
|
|
|
log.e(ex, "response body is not JSON or missing 'error' attribute.")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// HTMLならタグの除去を試みる
|
|
|
|
|
val ct = response.body()?.contentType()
|
|
|
|
|
if(ct?.subtype() == "html") {
|
2018-01-21 17:47:13 +01:00
|
|
|
|
val decoded = DecodeOptions().decodeHTML(sv).toString()
|
2018-01-17 18:39:16 +01:00
|
|
|
|
|
|
|
|
|
return reWhiteSpace.matcher(decoded).replaceAll(" ").trim()
|
2018-01-12 10:01:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// XXX: Amazon S3 が403を返した場合にcontent-typeが?/xmlでserverがAmazonならXMLをパースしてエラーを整形することもできるが、多分必要ない
|
|
|
|
|
|
2018-01-17 18:39:16 +01:00
|
|
|
|
return reWhiteSpace.matcher(sv).replaceAll(" ").trim()
|
2018-01-12 10:01:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fun formatResponse(
|
|
|
|
|
response : Response,
|
|
|
|
|
caption : String,
|
|
|
|
|
bodyString : String? = null,
|
|
|
|
|
jsonErrorParser : (json : JSONObject) -> String? = DEFAULT_JSON_ERROR_PARSER
|
|
|
|
|
) : String {
|
2018-08-20 02:07:55 +02:00
|
|
|
|
val url = response.request()?.url()
|
2018-08-20 19:37:42 +02:00
|
|
|
|
if(url?.toString()?.contains("misskey") == true) {
|
2018-08-20 02:07:55 +02:00
|
|
|
|
log.d("Misskey response error: url=$url")
|
|
|
|
|
}
|
2018-01-12 10:01:25 +01:00
|
|
|
|
val sb = StringBuilder()
|
|
|
|
|
try {
|
|
|
|
|
// body は既に読み終わっているか、そうでなければこれから読む
|
|
|
|
|
if(bodyString != null) {
|
|
|
|
|
sb.append(simplifyErrorHtml(response, bodyString, jsonErrorParser))
|
|
|
|
|
} else {
|
|
|
|
|
try {
|
|
|
|
|
val string = response.body()?.string()
|
|
|
|
|
if(string != null) {
|
|
|
|
|
sb.append(simplifyErrorHtml(response, string, jsonErrorParser))
|
|
|
|
|
}
|
|
|
|
|
} catch(ex : Throwable) {
|
|
|
|
|
log.e(ex, "missing response body.")
|
|
|
|
|
sb.append("(missing response body)")
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(sb.isNotEmpty()) sb.append(' ')
|
|
|
|
|
sb.append("(HTTP ").append(Integer.toString(response.code()))
|
|
|
|
|
|
|
|
|
|
val message = response.message()
|
|
|
|
|
if(message != null && message.isNotEmpty()) {
|
|
|
|
|
sb.append(' ').append(message)
|
|
|
|
|
}
|
|
|
|
|
sb.append(")")
|
|
|
|
|
|
|
|
|
|
if(caption.isNotEmpty()) {
|
|
|
|
|
sb.append(' ').append(caption)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} catch(ex : Throwable) {
|
|
|
|
|
log.trace(ex)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return sb.toString().replace("\n+".toRegex(), "\n")
|
|
|
|
|
}
|
|
|
|
|
|
2018-05-11 15:42:54 +02:00
|
|
|
|
fun getScopeString(ti : TootInstance) = when {
|
2018-05-14 16:41:13 +02:00
|
|
|
|
ti.versionGE(TootInstance.VERSION_2_4_0_rc1) -> "read+write+follow+push"
|
2018-05-11 15:42:54 +02:00
|
|
|
|
else -> "read+write+follow"
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-19 06:19:33 +02:00
|
|
|
|
fun getScopeArrayMisskey(@Suppress("UNUSED_PARAMETER") ti : TootInstance) =
|
|
|
|
|
JSONArray().apply {
|
2018-08-30 14:33:22 +02:00
|
|
|
|
|
2018-08-19 06:19:33 +02:00
|
|
|
|
put("account-read")
|
|
|
|
|
put("account-write")
|
2018-08-30 14:33:22 +02:00
|
|
|
|
|
2018-08-24 18:24:11 +02:00
|
|
|
|
put("note-read")
|
2018-08-19 06:19:33 +02:00
|
|
|
|
put("note-write")
|
2018-08-30 14:33:22 +02:00
|
|
|
|
|
2018-08-24 18:24:11 +02:00
|
|
|
|
put("reaction-read")
|
2018-08-19 06:19:33 +02:00
|
|
|
|
put("reaction-write")
|
2018-08-30 14:33:22 +02:00
|
|
|
|
|
2018-08-23 07:45:12 +02:00
|
|
|
|
put("following-read") // フォロリク申請一覧で使われていた
|
2018-08-24 18:24:11 +02:00
|
|
|
|
put("following-write")
|
2018-08-30 14:33:22 +02:00
|
|
|
|
|
2018-08-19 06:19:33 +02:00
|
|
|
|
put("drive-read")
|
|
|
|
|
put("drive-write")
|
2018-08-30 14:33:22 +02:00
|
|
|
|
|
2018-08-19 06:19:33 +02:00
|
|
|
|
put("notification-read")
|
|
|
|
|
put("notification-write")
|
2018-08-30 14:33:22 +02:00
|
|
|
|
|
2018-08-24 18:24:11 +02:00
|
|
|
|
put("favorite-read")
|
2018-08-30 14:33:22 +02:00
|
|
|
|
put("favorites-read")
|
2018-08-20 19:37:42 +02:00
|
|
|
|
put("favorite-write")
|
2018-08-30 14:33:22 +02:00
|
|
|
|
|
2018-08-20 19:37:42 +02:00
|
|
|
|
put("account/read")
|
|
|
|
|
put("account/write")
|
2018-08-30 14:33:22 +02:00
|
|
|
|
|
2018-08-24 18:24:11 +02:00
|
|
|
|
put("messaging-read")
|
|
|
|
|
put("messaging-write")
|
2018-08-30 14:33:22 +02:00
|
|
|
|
|
2018-08-24 18:24:11 +02:00
|
|
|
|
put("vote-read")
|
|
|
|
|
put("vote-write")
|
2018-08-30 14:33:22 +02:00
|
|
|
|
|
2018-08-20 19:37:42 +02:00
|
|
|
|
// https://github.com/syuilo/misskey/issues/2341
|
2018-08-19 06:19:33 +02:00
|
|
|
|
}
|
|
|
|
|
|
2018-08-30 15:06:23 +02:00
|
|
|
|
private fun encodeScopeArray(scope_array : JSONArray?) : String? {
|
|
|
|
|
scope_array ?: return null
|
|
|
|
|
val list = scope_array.toStringArrayList()
|
|
|
|
|
list.sort()
|
|
|
|
|
return list.joinToString(",")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private fun compareScopeArray(a : JSONArray, b : JSONArray?) : Boolean {
|
|
|
|
|
return encodeScopeArray(a) == encodeScopeArray(b)
|
|
|
|
|
}
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Suppress("unused")
|
2018-01-12 10:01:25 +01:00
|
|
|
|
internal val isApiCancelled : Boolean
|
2018-01-04 19:52:25 +01:00
|
|
|
|
get() = callback.isApiCancelled
|
|
|
|
|
|
|
|
|
|
fun publishApiProgress(s : String) {
|
|
|
|
|
callback.publishApiProgress(s)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fun publishApiProgressRatio(value : Int, max : Int) {
|
|
|
|
|
callback.publishApiProgressRatio(value, max)
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
|
// ユーティリティ
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
// リクエストをokHttpに渡してレスポンスを取得する
|
|
|
|
|
internal inline fun sendRequest(
|
|
|
|
|
result : TootApiResult,
|
|
|
|
|
progressPath : String? = null,
|
2018-09-01 02:49:57 +02:00
|
|
|
|
tmpOkhttpClient : OkHttpClient? = null,
|
2018-01-12 10:01:25 +01:00
|
|
|
|
block : () -> Request
|
|
|
|
|
) : Boolean {
|
|
|
|
|
return try {
|
|
|
|
|
result.response = null
|
|
|
|
|
result.bodyString = null
|
|
|
|
|
result.data = null
|
|
|
|
|
|
|
|
|
|
val request = block()
|
|
|
|
|
|
|
|
|
|
callback.publishApiProgress(
|
|
|
|
|
context.getString(
|
|
|
|
|
R.string.request_api
|
|
|
|
|
, request.method()
|
|
|
|
|
, progressPath ?: request.url().encodedPath()
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
|
2018-12-06 22:38:49 +01:00
|
|
|
|
val response = httpClient.getResponse(request, tmpOkhttpClient = tmpOkhttpClient)
|
|
|
|
|
result.response = response
|
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
null == result.error
|
|
|
|
|
|
|
|
|
|
} catch(ex : Throwable) {
|
2018-01-21 13:46:36 +01:00
|
|
|
|
result.setError(
|
|
|
|
|
"${result.caption}: ${ex.withCaption(
|
|
|
|
|
context.resources,
|
|
|
|
|
R.string.network_error
|
|
|
|
|
)}"
|
|
|
|
|
)
|
2018-01-12 10:01:25 +01:00
|
|
|
|
false
|
|
|
|
|
}
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
// レスポンスがエラーかボディがカラならエラー状態を設定する
|
|
|
|
|
// 例外を出すかも
|
|
|
|
|
internal fun readBodyString(
|
|
|
|
|
result : TootApiResult,
|
|
|
|
|
progressPath : String? = null,
|
|
|
|
|
jsonErrorParser : (json : JSONObject) -> String? = DEFAULT_JSON_ERROR_PARSER
|
|
|
|
|
) : String? {
|
|
|
|
|
|
|
|
|
|
if(isApiCancelled) return null
|
|
|
|
|
|
|
|
|
|
val response = result.response !!
|
|
|
|
|
|
|
|
|
|
val request = response.request()
|
|
|
|
|
if(request != null) {
|
2018-01-21 13:46:36 +01:00
|
|
|
|
publishApiProgress(
|
|
|
|
|
context.getString(
|
|
|
|
|
R.string.reading_api,
|
|
|
|
|
request.method(),
|
|
|
|
|
progressPath ?: result.caption
|
|
|
|
|
)
|
|
|
|
|
)
|
2018-01-12 10:01:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
val bodyString = response.body()?.string()
|
|
|
|
|
if(isApiCancelled) return null
|
|
|
|
|
|
2018-08-20 19:37:42 +02:00
|
|
|
|
// Misskey の /api/notes/favorites/create は 204(no content)を返す。ボディはカラになる。
|
2018-08-30 14:33:22 +02:00
|
|
|
|
if(bodyString?.isEmpty() != false && response.code() in 200 until 300) {
|
2018-08-20 19:37:42 +02:00
|
|
|
|
result.bodyString = ""
|
|
|
|
|
return ""
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
if(! response.isSuccessful || bodyString?.isEmpty() != false) {
|
|
|
|
|
|
|
|
|
|
result.error = TootApiClient.formatResponse(
|
|
|
|
|
response,
|
|
|
|
|
result.caption,
|
|
|
|
|
if(bodyString?.isNotEmpty() == true) bodyString else NO_INFORMATION,
|
|
|
|
|
jsonErrorParser
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return if(result.error != null) {
|
|
|
|
|
null
|
|
|
|
|
} else {
|
|
|
|
|
publishApiProgress(context.getString(R.string.parsing_response))
|
|
|
|
|
result.bodyString = bodyString
|
|
|
|
|
bodyString
|
|
|
|
|
}
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-03-10 00:12:40 +01:00
|
|
|
|
// レスポンスがエラーかボディがカラならエラー状態を設定する
|
|
|
|
|
// 例外を出すかも
|
2018-05-11 15:42:54 +02:00
|
|
|
|
private fun readBodyBytes(
|
2018-03-10 00:12:40 +01:00
|
|
|
|
result : TootApiResult,
|
|
|
|
|
progressPath : String? = null,
|
|
|
|
|
jsonErrorParser : (json : JSONObject) -> String? = DEFAULT_JSON_ERROR_PARSER
|
|
|
|
|
) : ByteArray? {
|
|
|
|
|
|
|
|
|
|
if(isApiCancelled) return null
|
|
|
|
|
|
|
|
|
|
val response = result.response !!
|
|
|
|
|
|
|
|
|
|
val request = response.request()
|
|
|
|
|
if(request != null) {
|
|
|
|
|
publishApiProgress(
|
|
|
|
|
context.getString(
|
|
|
|
|
R.string.reading_api,
|
|
|
|
|
request.method(),
|
|
|
|
|
progressPath ?: result.caption
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
val bodyBytes = response.body()?.bytes()
|
|
|
|
|
if(isApiCancelled) return null
|
|
|
|
|
|
|
|
|
|
if(! response.isSuccessful || bodyBytes?.isEmpty() != false) {
|
|
|
|
|
|
|
|
|
|
result.error = TootApiClient.formatResponse(
|
|
|
|
|
response,
|
|
|
|
|
result.caption,
|
|
|
|
|
if(bodyBytes?.isNotEmpty() == true) bodyBytes.decodeUTF8() else NO_INFORMATION,
|
|
|
|
|
jsonErrorParser
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return if(result.error != null) {
|
|
|
|
|
null
|
|
|
|
|
} else {
|
|
|
|
|
result.bodyString = "(binary data)"
|
|
|
|
|
result.data = bodyBytes
|
|
|
|
|
bodyBytes
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-05-11 15:42:54 +02:00
|
|
|
|
private fun parseBytes(
|
2018-03-10 00:12:40 +01:00
|
|
|
|
result : TootApiResult,
|
|
|
|
|
progressPath : String? = null,
|
|
|
|
|
jsonErrorParser : (json : JSONObject) -> String? = DEFAULT_JSON_ERROR_PARSER
|
|
|
|
|
) : TootApiResult? {
|
|
|
|
|
|
|
|
|
|
val response = result.response !! // nullにならないはず
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
readBodyBytes(result, progressPath, jsonErrorParser)
|
|
|
|
|
?: return if(isApiCancelled) null else result
|
|
|
|
|
|
|
|
|
|
} catch(ex : Throwable) {
|
|
|
|
|
log.trace(ex)
|
|
|
|
|
result.error =
|
|
|
|
|
formatResponse(response, result.caption, result.bodyString ?: NO_INFORMATION)
|
|
|
|
|
}
|
|
|
|
|
return result
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
internal fun parseString(
|
|
|
|
|
result : TootApiResult,
|
|
|
|
|
progressPath : String? = null,
|
|
|
|
|
jsonErrorParser : (json : JSONObject) -> String? = DEFAULT_JSON_ERROR_PARSER
|
|
|
|
|
) : TootApiResult? {
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
val response = result.response !! // nullにならないはず
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
val bodyString = readBodyString(result, progressPath, jsonErrorParser)
|
|
|
|
|
?: return if(isApiCancelled) null else result
|
2018-01-10 16:47:35 +01:00
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
result.data = bodyString
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
|
|
|
|
} catch(ex : Throwable) {
|
|
|
|
|
log.trace(ex)
|
2018-01-21 13:46:36 +01:00
|
|
|
|
result.error =
|
|
|
|
|
formatResponse(response, result.caption, result.bodyString ?: NO_INFORMATION)
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
2018-01-12 10:01:25 +01:00
|
|
|
|
return result
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
// レスポンスからJSONデータを読む
|
|
|
|
|
internal fun parseJson(
|
|
|
|
|
result : TootApiResult,
|
|
|
|
|
progressPath : String? = null,
|
|
|
|
|
jsonErrorParser : (json : JSONObject) -> String? = DEFAULT_JSON_ERROR_PARSER
|
|
|
|
|
) : TootApiResult? // 引数に指定したresultそのものか、キャンセルされたらnull
|
|
|
|
|
{
|
|
|
|
|
val response = result.response !! // nullにならないはず
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
|
|
|
|
try {
|
2018-08-21 12:19:02 +02:00
|
|
|
|
var bodyString = readBodyString(result, progressPath, jsonErrorParser)
|
2018-01-12 10:01:25 +01:00
|
|
|
|
?: return if(isApiCancelled) null else result
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
2018-08-30 14:33:22 +02:00
|
|
|
|
if(bodyString.isEmpty()) {
|
|
|
|
|
|
2018-08-20 19:37:42 +02:00
|
|
|
|
// 204 no content は 空オブジェクトと解釈する
|
|
|
|
|
result.data = JSONObject()
|
2018-08-30 14:33:22 +02:00
|
|
|
|
|
2018-08-20 19:37:42 +02:00
|
|
|
|
} else if(reStartJsonArray.matcher(bodyString).find()) {
|
2018-01-21 13:46:36 +01:00
|
|
|
|
result.data = bodyString.toJsonArray()
|
2018-01-12 10:01:25 +01:00
|
|
|
|
|
|
|
|
|
} else if(reStartJsonObject.matcher(bodyString).find()) {
|
2018-01-21 13:46:36 +01:00
|
|
|
|
val json = bodyString.toJsonObject()
|
2018-01-12 10:01:25 +01:00
|
|
|
|
val error_message = jsonErrorParser(json)
|
|
|
|
|
if(error_message != null) {
|
|
|
|
|
result.error = error_message
|
|
|
|
|
} else {
|
|
|
|
|
result.data = json
|
|
|
|
|
}
|
2018-08-30 14:33:22 +02:00
|
|
|
|
} else {
|
2018-08-21 12:19:02 +02:00
|
|
|
|
// HTMLならタグを除去する
|
|
|
|
|
val ct = response.body()?.contentType()
|
|
|
|
|
if(ct?.subtype() == "html") {
|
|
|
|
|
val decoded = DecodeOptions().decodeHTML(bodyString).toString()
|
2018-08-30 14:33:22 +02:00
|
|
|
|
bodyString = decoded
|
2018-08-21 12:19:02 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
val sb = StringBuilder()
|
|
|
|
|
.append(context.getString(R.string.response_not_json))
|
|
|
|
|
.append(' ')
|
|
|
|
|
.append(bodyString)
|
2018-08-30 14:33:22 +02:00
|
|
|
|
|
2018-08-21 12:19:02 +02:00
|
|
|
|
if(sb.isNotEmpty()) sb.append(' ')
|
|
|
|
|
sb.append("(HTTP ").append(Integer.toString(response.code()))
|
|
|
|
|
|
|
|
|
|
val message = response.message()
|
|
|
|
|
if(message != null && message.isNotEmpty()) {
|
|
|
|
|
sb.append(' ').append(message)
|
|
|
|
|
}
|
|
|
|
|
sb.append(")")
|
|
|
|
|
|
2018-08-30 14:33:22 +02:00
|
|
|
|
val url = response.request()?.url()?.toString()
|
|
|
|
|
if(url?.isNotEmpty() == true) {
|
2018-08-21 12:19:02 +02:00
|
|
|
|
sb.append(' ').append(url)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
result.error = sb.toString()
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} catch(ex : Throwable) {
|
|
|
|
|
log.trace(ex)
|
2018-01-21 13:46:36 +01:00
|
|
|
|
result.error =
|
|
|
|
|
formatResponse(response, result.caption, result.bodyString ?: NO_INFORMATION)
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
return result
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
2018-01-21 13:46:36 +01:00
|
|
|
|
fun request(
|
|
|
|
|
path : String,
|
|
|
|
|
request_builder : Request.Builder = Request.Builder()
|
|
|
|
|
) : TootApiResult? {
|
2018-01-12 10:01:25 +01:00
|
|
|
|
val result = TootApiResult.makeWithCaption(instance)
|
|
|
|
|
if(result.error != null) return result
|
|
|
|
|
|
2018-11-27 17:53:27 +01:00
|
|
|
|
val account = this.account // may null
|
2018-01-12 10:01:25 +01:00
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
if(! sendRequest(result) {
|
2018-01-21 13:46:36 +01:00
|
|
|
|
|
|
|
|
|
log.d("request: $path")
|
|
|
|
|
|
2018-05-11 15:42:54 +02:00
|
|
|
|
request_builder.url("https://$instance$path")
|
2018-01-21 13:46:36 +01:00
|
|
|
|
|
2018-11-27 17:53:27 +01:00
|
|
|
|
val access_token = account?.getAccessToken()
|
2018-01-21 13:46:36 +01:00
|
|
|
|
if(access_token?.isNotEmpty() == true) {
|
2018-05-11 15:42:54 +02:00
|
|
|
|
request_builder.header("Authorization", "Bearer $access_token")
|
2018-01-21 13:46:36 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
request_builder.build()
|
|
|
|
|
|
|
|
|
|
}) return result
|
2018-01-12 10:01:25 +01:00
|
|
|
|
|
|
|
|
|
return parseJson(result)
|
|
|
|
|
} finally {
|
|
|
|
|
val error = result.error
|
|
|
|
|
if(error != null) log.d("error: $error")
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-19 06:19:33 +02:00
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
|
// misskey authentication
|
|
|
|
|
|
2018-01-04 19:52:25 +01:00
|
|
|
|
// 疑似アカウントの追加時に、インスタンスの検証を行う
|
2018-08-19 06:19:33 +02:00
|
|
|
|
private fun getInstanceInformationMisskey() : TootApiResult? {
|
2018-01-04 19:52:25 +01:00
|
|
|
|
val result = TootApiResult.makeWithCaption(instance)
|
2018-01-10 16:47:35 +01:00
|
|
|
|
if(result.error != null) return result
|
2018-08-19 06:19:33 +02:00
|
|
|
|
if(sendRequest(result) {
|
|
|
|
|
JSONObject().apply {
|
|
|
|
|
put("dummy", 1)
|
|
|
|
|
}
|
|
|
|
|
.toPostRequestBuilder()
|
|
|
|
|
.url("https://$instance/api/meta")
|
|
|
|
|
.build()
|
|
|
|
|
}) {
|
|
|
|
|
parseJson(result) ?: return null
|
|
|
|
|
result.jsonObject?.put(KEY_IS_MISSKEY, true)
|
|
|
|
|
}
|
|
|
|
|
return result
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// インスタンス情報を取得する
|
2018-08-20 19:37:42 +02:00
|
|
|
|
internal fun parseInstanceInformation(result : TootApiResult?) : TootApiResult? {
|
2018-12-07 01:50:11 +01:00
|
|
|
|
val json = result?.jsonObject
|
|
|
|
|
if(json != null) {
|
|
|
|
|
val parser = TootParser(
|
|
|
|
|
context,
|
|
|
|
|
LinkHelper.newLinkHelper(instance, isMisskey = json.optBoolean(KEY_IS_MISSKEY))
|
|
|
|
|
)
|
|
|
|
|
val ti = parser.instance(json)
|
|
|
|
|
if(ti != null) {
|
|
|
|
|
result.data = ti
|
|
|
|
|
} else {
|
|
|
|
|
result.setError("can't parse data in instance information.")
|
2018-08-19 06:19:33 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2018-08-20 19:37:42 +02:00
|
|
|
|
return result
|
2018-08-19 06:19:33 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private fun getAppInfoMisskey(appId : String?) : TootApiResult? {
|
|
|
|
|
appId ?: return TootApiResult("missing app id")
|
|
|
|
|
val result = TootApiResult.makeWithCaption(instance)
|
|
|
|
|
if(result.error != null) return result
|
|
|
|
|
if(sendRequest(result) {
|
|
|
|
|
JSONObject().apply {
|
|
|
|
|
put("appId", appId)
|
|
|
|
|
}
|
|
|
|
|
.toPostRequestBuilder()
|
|
|
|
|
.url("https://$instance/api/app/show")
|
|
|
|
|
.build()
|
|
|
|
|
}) {
|
|
|
|
|
parseJson(result) ?: return null
|
|
|
|
|
result.jsonObject?.put(KEY_IS_MISSKEY, true)
|
|
|
|
|
}
|
|
|
|
|
return result
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-30 14:33:22 +02:00
|
|
|
|
private fun prepareBrowserUrlMisskey(appSecret : String) : String? {
|
2018-08-19 06:19:33 +02:00
|
|
|
|
|
|
|
|
|
val result = TootApiResult.makeWithCaption(instance)
|
|
|
|
|
|
|
|
|
|
if(result.error != null) {
|
|
|
|
|
showToast(context, false, result.error)
|
|
|
|
|
return null
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-20 19:37:42 +02:00
|
|
|
|
|
2018-08-16 21:58:30 +02:00
|
|
|
|
|
2018-08-19 06:19:33 +02:00
|
|
|
|
if(! sendRequest(result) {
|
|
|
|
|
JSONObject().apply {
|
|
|
|
|
put("appSecret", appSecret)
|
|
|
|
|
}
|
|
|
|
|
.toPostRequestBuilder()
|
|
|
|
|
.url("https://$instance/api/auth/session/generate")
|
|
|
|
|
.build()
|
|
|
|
|
}
|
|
|
|
|
) {
|
|
|
|
|
val error = result.error
|
|
|
|
|
if(error != null) {
|
|
|
|
|
showToast(context, false, error)
|
|
|
|
|
return null
|
|
|
|
|
}
|
|
|
|
|
return null
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
parseJson(result) ?: return null
|
|
|
|
|
|
|
|
|
|
val jsonObject = result.jsonObject
|
|
|
|
|
if(jsonObject == null) {
|
|
|
|
|
showToast(context, false, result.error)
|
|
|
|
|
return null
|
|
|
|
|
}
|
|
|
|
|
// {"token":"0ba88e2d-4b7d-4599-8d90-dc341a005637","url":"https://misskey.xyz/auth/0ba88e2d-4b7d-4599-8d90-dc341a005637"}
|
|
|
|
|
|
|
|
|
|
// ブラウザで開くURL
|
|
|
|
|
val url = jsonObject.parseString("url")
|
|
|
|
|
if(url?.isEmpty() != false) {
|
|
|
|
|
showToast(context, false, "missing 'url' in auth session response.")
|
|
|
|
|
return null
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
val e = PrefDevice.prefDevice(context)
|
|
|
|
|
.edit()
|
|
|
|
|
.putString(PrefDevice.LAST_AUTH_INSTANCE, instance)
|
|
|
|
|
.putString(PrefDevice.LAST_AUTH_SECRET, appSecret)
|
|
|
|
|
|
|
|
|
|
val account = this.account
|
|
|
|
|
if(account != null) {
|
|
|
|
|
e.putLong(PrefDevice.LAST_AUTH_DB_ID, account.db_id)
|
|
|
|
|
} else {
|
|
|
|
|
e.remove(PrefDevice.LAST_AUTH_DB_ID)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
e.apply()
|
|
|
|
|
|
|
|
|
|
return url
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private fun registerClientMisskey(
|
|
|
|
|
scope_array : JSONArray,
|
|
|
|
|
client_name : String
|
|
|
|
|
) : TootApiResult? {
|
|
|
|
|
val result = TootApiResult.makeWithCaption(instance)
|
|
|
|
|
if(result.error != null) return result
|
2018-08-16 21:58:30 +02:00
|
|
|
|
if(sendRequest(result) {
|
2018-08-19 06:19:33 +02:00
|
|
|
|
JSONObject().apply {
|
|
|
|
|
put("nameId", "SubwayTooter")
|
|
|
|
|
put("name", client_name)
|
|
|
|
|
put("description", "Android app for federated SNS")
|
|
|
|
|
put("callbackUrl", "subwaytooter://misskey/auth_callback")
|
|
|
|
|
put("permission", scope_array)
|
|
|
|
|
}
|
|
|
|
|
.toPostRequestBuilder()
|
|
|
|
|
.url("https://$instance/api/app/create")
|
|
|
|
|
.build()
|
|
|
|
|
}) {
|
|
|
|
|
parseJson(result) ?: return null
|
|
|
|
|
}
|
|
|
|
|
return result
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private fun authentication1Misskey(clientNameArg : String, ti : TootInstance) : TootApiResult? {
|
|
|
|
|
val result = TootApiResult.makeWithCaption(this.instance)
|
|
|
|
|
if(result.error != null) return result
|
|
|
|
|
val instance = result.caption // same to instance
|
|
|
|
|
|
|
|
|
|
// クライアントIDがアプリ上に保存されているか?
|
|
|
|
|
val client_name = if(clientNameArg.isNotEmpty()) clientNameArg else DEFAULT_CLIENT_NAME
|
|
|
|
|
val client_info = ClientInfo.load(instance, client_name)
|
|
|
|
|
|
|
|
|
|
// スコープ一覧を取得する
|
|
|
|
|
val scope_array = getScopeArrayMisskey(ti)
|
|
|
|
|
|
|
|
|
|
if(client_info != null && client_info.optBoolean(KEY_IS_MISSKEY)) {
|
2018-08-20 19:37:42 +02:00
|
|
|
|
val appSecret = client_info.parseString(KEY_MISSKEY_APP_SECRET)
|
|
|
|
|
|
2018-08-19 06:19:33 +02:00
|
|
|
|
val r2 = getAppInfoMisskey(client_info.parseString("id"))
|
|
|
|
|
val tmpClientInfo = r2?.jsonObject
|
|
|
|
|
// tmpClientInfo はsecretを含まないので保存してはいけない
|
|
|
|
|
if(tmpClientInfo != null // アプリが登録済みで
|
|
|
|
|
&& client_name == tmpClientInfo.parseString("name") // クライアント名が一致してて
|
2018-08-30 15:06:23 +02:00
|
|
|
|
&& compareScopeArray(
|
|
|
|
|
scope_array,
|
|
|
|
|
tmpClientInfo.optJSONArray("permission")
|
|
|
|
|
) // パーミッションが同じ
|
2018-08-20 19:37:42 +02:00
|
|
|
|
&& appSecret?.isNotEmpty() == true
|
2018-08-19 06:19:33 +02:00
|
|
|
|
) {
|
|
|
|
|
// クライアント情報を再利用する
|
2018-08-20 19:37:42 +02:00
|
|
|
|
result.data = prepareBrowserUrlMisskey(appSecret)
|
2018-08-19 06:19:33 +02:00
|
|
|
|
return result
|
|
|
|
|
} else {
|
|
|
|
|
// XXX appSecretを使ってクライアント情報を削除できるようにするべきだが、該当するAPIが存在しない
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
val r2 = registerClientMisskey(scope_array, client_name)
|
|
|
|
|
val jsonObject = r2?.jsonObject ?: return r2
|
|
|
|
|
|
2018-08-20 19:37:42 +02:00
|
|
|
|
val appSecret = jsonObject.parseString(KEY_MISSKEY_APP_SECRET)
|
2018-08-30 14:33:22 +02:00
|
|
|
|
if(appSecret?.isEmpty() != false) {
|
|
|
|
|
showToast(context, true, context.getString(R.string.cant_get_misskey_app_secret))
|
2018-08-20 19:37:42 +02:00
|
|
|
|
return null
|
|
|
|
|
}
|
2018-08-19 06:19:33 +02:00
|
|
|
|
// {
|
|
|
|
|
// "createdAt": "2018-08-19T00:43:10.105Z",
|
|
|
|
|
// "userId": null,
|
|
|
|
|
// "name": "Via芸",
|
|
|
|
|
// "nameId": "test1",
|
|
|
|
|
// "description": "test1",
|
|
|
|
|
// "permission": [
|
|
|
|
|
// "account-read",
|
|
|
|
|
// "account-write",
|
|
|
|
|
// "note-write",
|
|
|
|
|
// "reaction-write",
|
|
|
|
|
// "following-write",
|
|
|
|
|
// "drive-read",
|
|
|
|
|
// "drive-write",
|
|
|
|
|
// "notification-read",
|
|
|
|
|
// "notification-write"
|
|
|
|
|
// ],
|
|
|
|
|
// "callbackUrl": "test1://test1/auth_callback",
|
|
|
|
|
// "id": "5b78bd1ea0db0527f25815c3",
|
|
|
|
|
// "iconUrl": "https://misskey.xyz/files/app-default.jpg"
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// 2018/8/19現在、/api/app/create のレスポンスにsecretが含まれないので認証に使えない
|
|
|
|
|
// https://github.com/syuilo/misskey/issues/2343
|
|
|
|
|
|
|
|
|
|
jsonObject.put(KEY_IS_MISSKEY, true)
|
|
|
|
|
jsonObject.put(KEY_AUTH_VERSION, AUTH_VERSION)
|
|
|
|
|
ClientInfo.save(instance, client_name, jsonObject.toString())
|
2018-08-20 19:37:42 +02:00
|
|
|
|
result.data = prepareBrowserUrlMisskey(appSecret)
|
2018-08-19 06:19:33 +02:00
|
|
|
|
|
|
|
|
|
return result
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// oAuth2認証の続きを行う
|
|
|
|
|
fun authentication2Misskey(clientNameArg : String, token : String) : TootApiResult? {
|
|
|
|
|
val result = TootApiResult.makeWithCaption(instance)
|
|
|
|
|
if(result.error != null) return result
|
|
|
|
|
val instance = result.caption // same to instance
|
|
|
|
|
val client_name = if(clientNameArg.isNotEmpty()) clientNameArg else DEFAULT_CLIENT_NAME
|
|
|
|
|
|
|
|
|
|
@Suppress("UNUSED_VARIABLE")
|
|
|
|
|
val client_info = ClientInfo.load(instance, client_name)
|
|
|
|
|
?: return result.setError("missing client id")
|
|
|
|
|
|
2018-08-20 19:37:42 +02:00
|
|
|
|
val appSecret = client_info.parseString(KEY_MISSKEY_APP_SECRET)
|
2018-08-30 14:33:22 +02:00
|
|
|
|
if(appSecret?.isEmpty() != false) {
|
2018-08-20 19:37:42 +02:00
|
|
|
|
return result.setError(context.getString(R.string.cant_get_misskey_app_secret))
|
|
|
|
|
}
|
2018-08-30 14:33:22 +02:00
|
|
|
|
|
2018-08-19 06:19:33 +02:00
|
|
|
|
if(! sendRequest(result) {
|
|
|
|
|
JSONObject().apply {
|
|
|
|
|
put("appSecret", appSecret)
|
|
|
|
|
put("token", token)
|
|
|
|
|
}
|
|
|
|
|
.toPostRequestBuilder()
|
|
|
|
|
.url("https://$instance/api/auth/session/userkey")
|
|
|
|
|
.build()
|
2018-08-16 21:58:30 +02:00
|
|
|
|
}
|
|
|
|
|
) {
|
|
|
|
|
return result
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-19 06:19:33 +02:00
|
|
|
|
parseJson(result) ?: return null
|
|
|
|
|
|
|
|
|
|
val token_info = result.jsonObject ?: return result
|
|
|
|
|
|
2018-08-20 19:37:42 +02:00
|
|
|
|
// {"accessToken":"...","user":{…}}
|
2018-08-19 06:19:33 +02:00
|
|
|
|
|
|
|
|
|
val access_token = token_info.parseString("accessToken")
|
|
|
|
|
if(access_token?.isEmpty() != false) {
|
|
|
|
|
return result.setError("missing accessToken in the response.")
|
|
|
|
|
}
|
|
|
|
|
|
2018-11-03 15:21:42 +01:00
|
|
|
|
val user : JSONObject = token_info.optJSONObject("user")
|
|
|
|
|
?: return result.setError("missing user in the response.")
|
2018-11-27 17:53:27 +01:00
|
|
|
|
|
2018-08-19 06:19:33 +02:00
|
|
|
|
token_info.remove("user")
|
|
|
|
|
|
|
|
|
|
val apiKey = "$access_token$appSecret".encodeUTF8().digestSHA256().encodeHexLower()
|
|
|
|
|
|
|
|
|
|
// ユーザ情報を読めたならtokenInfoを保存する
|
2018-11-27 17:53:27 +01:00
|
|
|
|
EntityId.mayNull(user.parseString("id"))?.putTo(token_info, KEY_USER_ID)
|
2018-08-19 06:19:33 +02:00
|
|
|
|
token_info.put(KEY_IS_MISSKEY, true)
|
|
|
|
|
token_info.put(KEY_AUTH_VERSION, AUTH_VERSION)
|
|
|
|
|
token_info.put(KEY_API_KEY_MISSKEY, apiKey)
|
|
|
|
|
|
|
|
|
|
// tokenInfoとユーザ情報の入ったresultを返す
|
|
|
|
|
result.tokenInfo = token_info
|
|
|
|
|
result.data = user
|
|
|
|
|
return result
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
// 疑似アカウントの追加時に、インスタンスの検証を行う
|
|
|
|
|
private fun getInstanceInformationMastodon() : TootApiResult? {
|
|
|
|
|
val result = TootApiResult.makeWithCaption(instance)
|
|
|
|
|
if(result.error != null) return result
|
|
|
|
|
|
|
|
|
|
if(sendRequest(result) {
|
|
|
|
|
Request.Builder().url("https://$instance/api/v1/instance").build()
|
2018-08-16 21:58:30 +02:00
|
|
|
|
}
|
|
|
|
|
) {
|
2018-08-19 06:19:33 +02:00
|
|
|
|
parseJson(result) ?: return null
|
2018-08-16 21:58:30 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// misskeyの事は忘れて本来のエラー情報を返す
|
|
|
|
|
return result
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
// クライアントをタンスに登録
|
2018-08-30 05:23:13 +02:00
|
|
|
|
fun registerClient(scope_string : String, clientName : String) : TootApiResult? {
|
2018-01-12 10:01:25 +01:00
|
|
|
|
val result = TootApiResult.makeWithCaption(this.instance)
|
|
|
|
|
if(result.error != null) return result
|
|
|
|
|
val instance = result.caption // same to instance
|
|
|
|
|
// OAuth2 クライアント登録
|
|
|
|
|
if(! sendRequest(result) {
|
2018-12-02 11:25:00 +01:00
|
|
|
|
("client_name=" + clientName.encodePercent()
|
|
|
|
|
+ "&redirect_uris=" + REDIRECT_URL.encodePercent()
|
|
|
|
|
+ "&scopes=$scope_string"
|
|
|
|
|
).toRequestBody().toPost()
|
2018-01-21 13:46:36 +01:00
|
|
|
|
.url("https://$instance/api/v1/apps")
|
|
|
|
|
.build()
|
|
|
|
|
}) return result
|
2018-01-12 10:01:25 +01:00
|
|
|
|
|
|
|
|
|
return parseJson(result)
|
|
|
|
|
}
|
2018-01-13 07:15:52 +01:00
|
|
|
|
|
2018-01-04 19:52:25 +01:00
|
|
|
|
// クライアントアプリの登録を確認するためのトークンを生成する
|
|
|
|
|
// oAuth2 Client Credentials の取得
|
|
|
|
|
// https://github.com/doorkeeper-gem/doorkeeper/wiki/Client-Credentials-flow
|
|
|
|
|
// このトークンはAPIを呼び出すたびに新しく生成される…
|
2018-01-12 10:01:25 +01:00
|
|
|
|
internal fun getClientCredential(client_info : JSONObject) : TootApiResult? {
|
2018-01-04 19:52:25 +01:00
|
|
|
|
val result = TootApiResult.makeWithCaption(this.instance)
|
2018-01-10 16:47:35 +01:00
|
|
|
|
if(result.error != null) return result
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
if(! sendRequest(result) {
|
2018-01-21 13:46:36 +01:00
|
|
|
|
|
|
|
|
|
val client_id = client_info.parseString("client_id")
|
|
|
|
|
?: return result.setError("missing client_id")
|
|
|
|
|
|
|
|
|
|
val client_secret = client_info.parseString("client_secret")
|
|
|
|
|
?: return result.setError("missing client_secret")
|
|
|
|
|
|
2018-12-02 11:25:00 +01:00
|
|
|
|
("grant_type=client_credentials"
|
|
|
|
|
+ "&client_id=" + client_id.encodePercent()
|
|
|
|
|
+ "&client_secret=" + client_secret.encodePercent()
|
2018-01-21 13:46:36 +01:00
|
|
|
|
)
|
2018-12-02 11:25:00 +01:00
|
|
|
|
.toRequestBody().toPost()
|
|
|
|
|
.url("https://$instance/oauth/token")
|
2018-01-21 13:46:36 +01:00
|
|
|
|
.build()
|
|
|
|
|
}) return result
|
2018-01-10 16:47:35 +01:00
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
val r2 = parseJson(result)
|
2018-01-04 19:52:25 +01:00
|
|
|
|
val jsonObject = r2?.jsonObject ?: return r2
|
2018-01-12 10:01:25 +01:00
|
|
|
|
|
2018-01-21 13:46:36 +01:00
|
|
|
|
val sv = jsonObject.parseString("access_token")
|
2018-01-04 19:52:25 +01:00
|
|
|
|
if(sv?.isNotEmpty() == true) {
|
|
|
|
|
result.data = sv
|
|
|
|
|
} else {
|
|
|
|
|
result.data = null
|
2018-01-12 10:01:25 +01:00
|
|
|
|
result.error = "missing client credential."
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
return result
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// client_credentialがまだ有効か調べる
|
2018-01-12 10:01:25 +01:00
|
|
|
|
internal fun verifyClientCredential(client_credential : String) : TootApiResult? {
|
2018-01-04 19:52:25 +01:00
|
|
|
|
val result = TootApiResult.makeWithCaption(this.instance)
|
|
|
|
|
if(result.error != null) return result
|
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
if(! sendRequest(result) {
|
2018-01-21 13:46:36 +01:00
|
|
|
|
Request.Builder()
|
|
|
|
|
.url("https://$instance/api/v1/apps/verify_credentials")
|
|
|
|
|
.header("Authorization", "Bearer $client_credential")
|
|
|
|
|
.build()
|
|
|
|
|
}) return result
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
return parseJson(result)
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-08-19 06:19:33 +02:00
|
|
|
|
// client_credentialを無効にする
|
|
|
|
|
private fun revokeClientCredential(
|
2018-05-11 15:42:54 +02:00
|
|
|
|
client_info : JSONObject,
|
|
|
|
|
client_credential : String
|
|
|
|
|
) : TootApiResult? {
|
|
|
|
|
val result = TootApiResult.makeWithCaption(this.instance)
|
|
|
|
|
if(result.error != null) return result
|
|
|
|
|
|
|
|
|
|
val client_id = client_info.parseString("client_id")
|
|
|
|
|
?: return result.setError("missing client_id")
|
|
|
|
|
|
|
|
|
|
val client_secret = client_info.parseString("client_secret")
|
|
|
|
|
?: return result.setError("missing client_secret")
|
|
|
|
|
|
|
|
|
|
if(! sendRequest(result) {
|
2018-12-02 11:25:00 +01:00
|
|
|
|
("token=" + client_credential.encodePercent()
|
|
|
|
|
+ "&client_id=" + client_id.encodePercent()
|
|
|
|
|
+ "&client_secret=" + client_secret.encodePercent()
|
|
|
|
|
).toRequestBody().toPost()
|
2018-05-11 15:42:54 +02:00
|
|
|
|
.url("https://$instance/oauth/revoke")
|
|
|
|
|
.build()
|
2018-12-02 11:25:00 +01:00
|
|
|
|
|
2018-05-11 15:42:54 +02:00
|
|
|
|
}) return result
|
|
|
|
|
|
|
|
|
|
return parseJson(result)
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-21 13:46:36 +01:00
|
|
|
|
// 認証ページURLを作る
|
2018-05-11 15:42:54 +02:00
|
|
|
|
internal fun prepareBrowserUrl(scope_string : String, client_info : JSONObject) : String? {
|
2018-01-04 19:52:25 +01:00
|
|
|
|
val account = this.account
|
2018-01-21 13:46:36 +01:00
|
|
|
|
val client_id = client_info.parseString("client_id") ?: return null
|
2018-01-12 10:01:25 +01:00
|
|
|
|
|
|
|
|
|
return ("https://" + instance + "/oauth/authorize"
|
2018-01-21 13:46:36 +01:00
|
|
|
|
+ "?client_id=" + client_id.encodePercent()
|
2018-01-04 19:52:25 +01:00
|
|
|
|
+ "&response_type=code"
|
2018-01-21 13:46:36 +01:00
|
|
|
|
+ "&redirect_uri=" + REDIRECT_URL.encodePercent()
|
2018-05-11 15:42:54 +02:00
|
|
|
|
+ "&scope=$scope_string"
|
|
|
|
|
+ "&scopes=$scope_string"
|
2018-08-19 06:19:33 +02:00
|
|
|
|
+ "&state=" + (if(account != null) "db:${account.db_id}" else "host:$instance")
|
2018-01-04 19:52:25 +01:00
|
|
|
|
+ "&grant_type=authorization_code"
|
|
|
|
|
+ "&approval_prompt=force"
|
2018-10-30 22:47:02 +01:00
|
|
|
|
+ "&force_login=true"
|
2018-01-04 19:52:25 +01:00
|
|
|
|
// +"&access_type=offline"
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-19 06:19:33 +02:00
|
|
|
|
private fun authentication1Mastodon(
|
|
|
|
|
clientNameArg : String,
|
|
|
|
|
ti : TootInstance
|
|
|
|
|
) : TootApiResult? {
|
2018-05-11 15:42:54 +02:00
|
|
|
|
|
2018-08-19 06:19:33 +02:00
|
|
|
|
// 前準備
|
2018-01-04 19:52:25 +01:00
|
|
|
|
val result = TootApiResult.makeWithCaption(this.instance)
|
|
|
|
|
if(result.error != null) return result
|
2018-01-10 16:47:35 +01:00
|
|
|
|
val instance = result.caption // same to instance
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
|
|
|
|
// クライアントIDがアプリ上に保存されているか?
|
|
|
|
|
val client_name = if(clientNameArg.isNotEmpty()) clientNameArg else DEFAULT_CLIENT_NAME
|
|
|
|
|
val client_info = ClientInfo.load(instance, client_name)
|
2018-08-19 06:19:33 +02:00
|
|
|
|
|
|
|
|
|
// スコープ一覧を取得する
|
|
|
|
|
|
|
|
|
|
val scope_string = getScopeString(ti)
|
|
|
|
|
|
|
|
|
|
if(client_info != null && ! client_info.optBoolean(KEY_IS_MISSKEY)) {
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
2018-01-21 13:46:36 +01:00
|
|
|
|
var client_credential = client_info.parseString(KEY_CLIENT_CREDENTIAL)
|
2018-05-11 15:42:54 +02:00
|
|
|
|
val old_scope = client_info.parseString(KEY_CLIENT_SCOPE)
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
|
|
|
|
// client_credential をまだ取得していないなら取得する
|
2018-01-12 10:01:25 +01:00
|
|
|
|
if(client_credential?.isEmpty() != false) {
|
2018-01-04 19:52:25 +01:00
|
|
|
|
val resultSub = getClientCredential(client_info)
|
|
|
|
|
client_credential = resultSub?.string
|
|
|
|
|
if(client_credential?.isNotEmpty() == true) {
|
|
|
|
|
try {
|
|
|
|
|
client_info.put(KEY_CLIENT_CREDENTIAL, client_credential)
|
|
|
|
|
ClientInfo.save(instance, client_name, client_info.toString())
|
|
|
|
|
} catch(ignored : JSONException) {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// client_credential があるならcredentialがまだ使えるか確認する
|
|
|
|
|
if(client_credential?.isNotEmpty() == true) {
|
|
|
|
|
val resultSub = verifyClientCredential(client_credential)
|
2018-01-10 16:47:35 +01:00
|
|
|
|
if(resultSub?.jsonObject != null) {
|
2018-05-11 15:42:54 +02:00
|
|
|
|
|
|
|
|
|
if(old_scope != scope_string) {
|
|
|
|
|
// マストドン2.4でスコープが追加された
|
|
|
|
|
// 取得時のスコープ指定がマッチしない(もしくは記録されていない)ならクライアント情報を再利用してはいけない
|
|
|
|
|
ClientInfo.delete(instance, client_name)
|
|
|
|
|
|
|
|
|
|
// client credential をタンスから消去する
|
|
|
|
|
revokeClientCredential(client_info, client_credential)
|
|
|
|
|
|
2018-08-19 06:19:33 +02:00
|
|
|
|
// XXX クライアントアプリ情報そのものはまだサーバに残っているが、明示的に消す方法は現状存在しない
|
2018-05-11 15:42:54 +02:00
|
|
|
|
} else {
|
|
|
|
|
// クライアント情報を再利用する
|
|
|
|
|
result.data = prepareBrowserUrl(scope_string, client_info)
|
|
|
|
|
return result
|
|
|
|
|
}
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-05-11 15:42:54 +02:00
|
|
|
|
val r2 = registerClient(scope_string, client_name)
|
2018-01-04 19:52:25 +01:00
|
|
|
|
val jsonObject = r2?.jsonObject ?: return r2
|
2018-01-10 16:47:35 +01:00
|
|
|
|
|
2018-01-04 19:52:25 +01:00
|
|
|
|
// {"id":999,"redirect_uri":"urn:ietf:wg:oauth:2.0:oob","client_id":"******","client_secret":"******"}
|
|
|
|
|
jsonObject.put(KEY_AUTH_VERSION, AUTH_VERSION)
|
2018-05-11 15:42:54 +02:00
|
|
|
|
jsonObject.put(KEY_CLIENT_SCOPE, scope_string)
|
2018-01-04 19:52:25 +01:00
|
|
|
|
ClientInfo.save(instance, client_name, jsonObject.toString())
|
2018-05-11 15:42:54 +02:00
|
|
|
|
result.data = prepareBrowserUrl(scope_string, jsonObject)
|
2018-01-12 10:01:25 +01:00
|
|
|
|
|
2018-01-04 19:52:25 +01:00
|
|
|
|
return result
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-20 19:37:42 +02:00
|
|
|
|
// 疑似アカウントの追加時に、インスタンスの検証を行う
|
|
|
|
|
fun getInstanceInformation() : TootApiResult? {
|
|
|
|
|
// misskeyのインスタンス情報を読めたら、それはmisskeyのインスタンス
|
|
|
|
|
val r2 = getInstanceInformationMisskey() ?: return null
|
|
|
|
|
if(r2.jsonObject != null) return r2
|
2018-11-27 17:53:27 +01:00
|
|
|
|
|
2018-10-31 03:53:35 +01:00
|
|
|
|
// マストドンのインスタンス情報を読めたら、それはマストドンのインスタンス
|
|
|
|
|
val r1 = getInstanceInformationMastodon() ?: return null
|
|
|
|
|
if(r1.jsonObject != null) return r1
|
2018-08-20 19:37:42 +02:00
|
|
|
|
|
|
|
|
|
return r1 // 通信エラーの表示ならr1でもr2でも構わないはず
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-19 06:19:33 +02:00
|
|
|
|
// クライアントを登録してブラウザで開くURLを生成する
|
|
|
|
|
fun authentication1(clientNameArg : String) : TootApiResult? {
|
|
|
|
|
|
2018-10-31 03:53:35 +01:00
|
|
|
|
// misskeyのインスタンス情報
|
|
|
|
|
var ri = parseInstanceInformation(getInstanceInformationMisskey())
|
2018-08-19 06:19:33 +02:00
|
|
|
|
var ti = ri?.data as? TootInstance
|
|
|
|
|
if(ti != null && (ri?.response?.code() ?: 0) in 200 until 300) {
|
2018-10-31 03:53:35 +01:00
|
|
|
|
return authentication1Misskey(clientNameArg, ti)
|
2018-08-19 06:19:33 +02:00
|
|
|
|
}
|
|
|
|
|
|
2018-10-31 03:53:35 +01:00
|
|
|
|
// マストドンのインスタンス情報
|
|
|
|
|
ri = parseInstanceInformation(getInstanceInformationMastodon())
|
2018-08-19 06:19:33 +02:00
|
|
|
|
ti = ri?.data as? TootInstance
|
|
|
|
|
if(ti != null && (ri?.response?.code() ?: 0) in 200 until 300) {
|
2018-10-31 03:53:35 +01:00
|
|
|
|
return authentication1Mastodon(clientNameArg, ti)
|
2018-08-19 06:19:33 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ri
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-04 19:52:25 +01:00
|
|
|
|
// oAuth2認証の続きを行う
|
2018-01-13 07:15:52 +01:00
|
|
|
|
fun authentication2(clientNameArg : String, code : String) : TootApiResult? {
|
2018-01-04 19:52:25 +01:00
|
|
|
|
val result = TootApiResult.makeWithCaption(instance)
|
|
|
|
|
if(result.error != null) return result
|
|
|
|
|
|
2018-01-10 16:47:35 +01:00
|
|
|
|
val instance = result.caption // same to instance
|
2018-01-04 19:52:25 +01:00
|
|
|
|
val client_name = if(clientNameArg.isNotEmpty()) clientNameArg else DEFAULT_CLIENT_NAME
|
2018-01-21 13:46:36 +01:00
|
|
|
|
val client_info =
|
|
|
|
|
ClientInfo.load(instance, client_name) ?: return result.setError("missing client id")
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
if(! sendRequest(result) {
|
2018-01-21 13:46:36 +01:00
|
|
|
|
|
2018-05-11 15:42:54 +02:00
|
|
|
|
val scope_string = client_info.optString(KEY_CLIENT_SCOPE)
|
|
|
|
|
|
2018-01-21 13:46:36 +01:00
|
|
|
|
val client_id = client_info.parseString("client_id")
|
|
|
|
|
val client_secret = client_info.parseString("client_secret")
|
|
|
|
|
if(client_id == null) return result.setError("missing client_id ")
|
|
|
|
|
if(client_secret == null) return result.setError("missing client_secret")
|
|
|
|
|
|
|
|
|
|
val post_content = ("grant_type=authorization_code"
|
|
|
|
|
+ "&code=" + code.encodePercent()
|
|
|
|
|
+ "&client_id=" + client_id.encodePercent()
|
|
|
|
|
+ "&redirect_uri=" + REDIRECT_URL.encodePercent()
|
|
|
|
|
+ "&client_secret=" + client_secret.encodePercent()
|
2018-05-11 15:42:54 +02:00
|
|
|
|
+ "&scope=$scope_string"
|
|
|
|
|
+ "&scopes=$scope_string")
|
2018-01-21 13:46:36 +01:00
|
|
|
|
|
2018-12-02 11:25:00 +01:00
|
|
|
|
post_content.toRequestBody().toPost()
|
2018-01-21 13:46:36 +01:00
|
|
|
|
.url("https://$instance/oauth/token")
|
|
|
|
|
.build()
|
|
|
|
|
|
|
|
|
|
}) return result
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
val r2 = parseJson(result)
|
|
|
|
|
val token_info = r2?.jsonObject ?: return r2
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
|
|
|
|
// {"access_token":"******","token_type":"bearer","scope":"read","created_at":1492334641}
|
2018-01-21 13:46:36 +01:00
|
|
|
|
val access_token = token_info.parseString("access_token")
|
2018-01-13 07:15:52 +01:00
|
|
|
|
if(access_token?.isEmpty() != false) {
|
2018-01-04 19:52:25 +01:00
|
|
|
|
return result.setError("missing access_token in the response.")
|
|
|
|
|
}
|
2018-01-13 07:15:52 +01:00
|
|
|
|
return getUserCredential(access_token, token_info)
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// アクセストークン手動入力でアカウントを更新する場合
|
|
|
|
|
// verify_credentialsを呼び出す
|
2018-01-13 07:15:52 +01:00
|
|
|
|
fun getUserCredential(
|
2018-08-20 02:07:55 +02:00
|
|
|
|
access_token : String
|
2018-08-20 19:37:42 +02:00
|
|
|
|
, tokenInfo : JSONObject = JSONObject()
|
|
|
|
|
, isMisskey : Boolean = false
|
2018-01-13 07:15:52 +01:00
|
|
|
|
) : TootApiResult? {
|
2018-08-20 19:37:42 +02:00
|
|
|
|
if(isMisskey) {
|
2018-08-20 02:07:55 +02:00
|
|
|
|
val result = TootApiResult.makeWithCaption(instance)
|
|
|
|
|
if(result.error != null) return result
|
|
|
|
|
|
|
|
|
|
// 認証されたアカウントのユーザ情報を取得する
|
|
|
|
|
if(! sendRequest(result) {
|
|
|
|
|
JSONObject()
|
2018-08-20 19:37:42 +02:00
|
|
|
|
.put("i", access_token)
|
2018-08-20 02:07:55 +02:00
|
|
|
|
.toPostRequestBuilder()
|
|
|
|
|
.url("https://$instance/api/i")
|
|
|
|
|
.build()
|
|
|
|
|
}) return result
|
|
|
|
|
|
|
|
|
|
val r2 = parseJson(result)
|
|
|
|
|
if(r2?.jsonObject != null) {
|
|
|
|
|
// ユーザ情報を読めたならtokenInfoを保存する
|
|
|
|
|
tokenInfo.put(KEY_AUTH_VERSION, AUTH_VERSION)
|
2018-08-20 19:37:42 +02:00
|
|
|
|
tokenInfo.put(KEY_API_KEY_MISSKEY, access_token)
|
|
|
|
|
tokenInfo.put(KEY_IS_MISSKEY, true)
|
2018-08-20 02:07:55 +02:00
|
|
|
|
result.tokenInfo = tokenInfo
|
|
|
|
|
}
|
|
|
|
|
return r2
|
|
|
|
|
|
2018-08-20 19:37:42 +02:00
|
|
|
|
} else {
|
2018-08-20 02:07:55 +02:00
|
|
|
|
val result = TootApiResult.makeWithCaption(instance)
|
|
|
|
|
if(result.error != null) return result
|
|
|
|
|
|
|
|
|
|
// 認証されたアカウントのユーザ情報を取得する
|
|
|
|
|
if(! sendRequest(result) {
|
|
|
|
|
Request.Builder()
|
|
|
|
|
.url("https://$instance/api/v1/accounts/verify_credentials")
|
|
|
|
|
.header("Authorization", "Bearer $access_token")
|
|
|
|
|
.build()
|
|
|
|
|
}) return result
|
|
|
|
|
|
|
|
|
|
val r2 = parseJson(result)
|
|
|
|
|
if(r2?.jsonObject != null) {
|
|
|
|
|
// ユーザ情報を読めたならtokenInfoを保存する
|
|
|
|
|
tokenInfo.put(KEY_AUTH_VERSION, AUTH_VERSION)
|
|
|
|
|
tokenInfo.put("access_token", access_token)
|
|
|
|
|
result.tokenInfo = tokenInfo
|
|
|
|
|
}
|
|
|
|
|
return r2
|
|
|
|
|
|
2018-01-13 07:15:52 +01:00
|
|
|
|
}
|
2018-01-12 10:01:25 +01:00
|
|
|
|
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-08-18 12:58:14 +02:00
|
|
|
|
fun searchMsp(query : String, max_id : String?) : TootApiResult? {
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
// ユーザトークンを読む
|
2018-01-21 13:46:36 +01:00
|
|
|
|
var user_token : String? = Pref.spMspUserToken(pref)
|
2018-01-12 10:01:25 +01:00
|
|
|
|
|
|
|
|
|
for(nTry in 0 until 3) {
|
2018-01-04 19:52:25 +01:00
|
|
|
|
if(callback.isApiCancelled) return null
|
2018-01-12 10:01:25 +01:00
|
|
|
|
|
|
|
|
|
// ユーザトークンがなければ取得する
|
2018-01-21 13:46:36 +01:00
|
|
|
|
if(user_token == null || user_token.isEmpty()) {
|
2018-01-12 10:01:25 +01:00
|
|
|
|
|
|
|
|
|
callback.publishApiProgress("get MSP user token...")
|
|
|
|
|
|
|
|
|
|
val result : TootApiResult = TootApiResult.makeWithCaption("Mastodon Search Portal")
|
|
|
|
|
if(result.error != null) return result
|
|
|
|
|
|
|
|
|
|
if(! sendRequest(result) {
|
2018-01-21 13:46:36 +01:00
|
|
|
|
Request.Builder()
|
|
|
|
|
.url(mspTokenUrl + "?apikey=" + mspApiKey.encodePercent())
|
|
|
|
|
.build()
|
|
|
|
|
}) return result
|
2018-01-12 10:01:25 +01:00
|
|
|
|
|
|
|
|
|
val r2 = parseJson(result) { json ->
|
2018-01-21 13:46:36 +01:00
|
|
|
|
val error = json.parseString("error")
|
2018-01-12 10:01:25 +01:00
|
|
|
|
if(error == null) {
|
|
|
|
|
null
|
|
|
|
|
} else {
|
2018-01-21 13:46:36 +01:00
|
|
|
|
val type = json.parseString("type")
|
2018-01-13 07:15:52 +01:00
|
|
|
|
"error: $type $error"
|
2018-01-12 10:01:25 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
val jsonObject = r2?.jsonObject ?: return r2
|
|
|
|
|
user_token = jsonObject.optJSONObject("result")?.optString("token")
|
|
|
|
|
if(user_token?.isEmpty() != false) {
|
|
|
|
|
return result.setError("Can't get MSP user token. response=${result.bodyString}")
|
2018-01-21 13:46:36 +01:00
|
|
|
|
} else {
|
|
|
|
|
pref.edit().put(Pref.spMspUserToken, user_token).apply()
|
2018-01-12 10:01:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-01-11 10:31:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
// ユーザトークンを使って検索APIを呼び出す
|
|
|
|
|
val result : TootApiResult = TootApiResult.makeWithCaption("Mastodon Search Portal")
|
|
|
|
|
if(result.error != null) return result
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
if(! sendRequest(result) {
|
2018-08-18 12:58:14 +02:00
|
|
|
|
val url = StringBuilder()
|
|
|
|
|
.append(mspSearchUrl)
|
|
|
|
|
.append("?apikey=").append(mspApiKey.encodePercent())
|
|
|
|
|
.append("&utoken=").append(user_token.encodePercent())
|
|
|
|
|
.append("&q=").append(query.encodePercent())
|
2018-08-19 06:19:33 +02:00
|
|
|
|
.append("&max=").append(max_id?.encodePercent() ?: "")
|
2018-01-21 13:46:36 +01:00
|
|
|
|
|
2018-08-18 12:58:14 +02:00
|
|
|
|
Request.Builder().url(url.toString()).build()
|
2018-01-21 13:46:36 +01:00
|
|
|
|
}) return result
|
2018-01-10 16:47:35 +01:00
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
var isUserTokenError = false
|
|
|
|
|
val r2 = parseJson(result) { json ->
|
2018-01-21 13:46:36 +01:00
|
|
|
|
val error = json.parseString("error")
|
2018-01-12 10:01:25 +01:00
|
|
|
|
if(error == null) {
|
|
|
|
|
null
|
|
|
|
|
} else {
|
|
|
|
|
// ユーザトークンがダメなら生成しなおす
|
|
|
|
|
val detail = json.optString("detail")
|
|
|
|
|
if("utoken" == detail) {
|
|
|
|
|
isUserTokenError = true
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-21 13:46:36 +01:00
|
|
|
|
val type = json.parseString("type")
|
2018-01-12 10:01:25 +01:00
|
|
|
|
"API returns error: $type $error"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(r2 == null || ! isUserTokenError) return r2
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
2018-01-12 10:01:25 +01:00
|
|
|
|
return TootApiResult("MSP user token retry exceeded.")
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
fun searchTootsearch(
|
|
|
|
|
query : String,
|
2018-08-18 12:58:14 +02:00
|
|
|
|
from : Long?
|
2018-01-12 10:01:25 +01:00
|
|
|
|
) : TootApiResult? {
|
|
|
|
|
|
|
|
|
|
val result = TootApiResult.makeWithCaption("Tootsearch")
|
|
|
|
|
if(result.error != null) return result
|
|
|
|
|
|
|
|
|
|
if(! sendRequest(result) {
|
2018-08-18 12:58:14 +02:00
|
|
|
|
val sb = StringBuilder()
|
|
|
|
|
.append("https://tootsearch.chotto.moe/api/v1/search?sort=")
|
|
|
|
|
.append("created_at:desc".encodePercent())
|
|
|
|
|
.append("&q=").append(query.encodePercent())
|
|
|
|
|
if(from != null) {
|
|
|
|
|
sb.append("&from=").append(from.toString().encodePercent())
|
|
|
|
|
}
|
2018-01-21 13:46:36 +01:00
|
|
|
|
|
|
|
|
|
Request.Builder()
|
2018-08-18 12:58:14 +02:00
|
|
|
|
.url(sb.toString())
|
2018-01-21 13:46:36 +01:00
|
|
|
|
.build()
|
|
|
|
|
|
|
|
|
|
}) return result
|
2018-01-12 10:01:25 +01:00
|
|
|
|
|
|
|
|
|
return parseJson(result)
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
////////////////////////////////////////////////////////////////////////
|
|
|
|
|
// JSONデータ以外を扱うリクエスト
|
2018-01-11 10:31:25 +01:00
|
|
|
|
|
2018-08-16 21:58:30 +02:00
|
|
|
|
fun http(req : Request) : TootApiResult? {
|
2018-05-12 10:17:12 +02:00
|
|
|
|
val result = TootApiResult.makeWithCaption(req.url().host())
|
2018-01-12 10:01:25 +01:00
|
|
|
|
if(result.error != null) return result
|
|
|
|
|
|
2018-05-12 10:17:12 +02:00
|
|
|
|
sendRequest(result, progressPath = null) { req }
|
|
|
|
|
return result
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-20 19:37:42 +02:00
|
|
|
|
// fun requestJson(req : Request) : TootApiResult? {
|
|
|
|
|
// val result = TootApiResult.makeWithCaption(req.url().host())
|
|
|
|
|
// if(result.error != null) return result
|
|
|
|
|
// if(sendRequest(result, progressPath = null) { req }) {
|
|
|
|
|
// parseJson(result)
|
|
|
|
|
// }
|
|
|
|
|
// return result
|
|
|
|
|
// }
|
2018-05-12 10:17:12 +02:00
|
|
|
|
|
|
|
|
|
// 疑似アカウントでステータスURLからステータスIDを取得するためにHTMLを取得する
|
2018-08-16 21:58:30 +02:00
|
|
|
|
fun getHttp(url : String) : TootApiResult? {
|
2018-05-12 10:17:12 +02:00
|
|
|
|
val result = http(Request.Builder().url(url).build())
|
2018-08-16 21:58:30 +02:00
|
|
|
|
if(result != null && result.error == null) {
|
2018-05-12 10:17:12 +02:00
|
|
|
|
parseString(result)
|
|
|
|
|
}
|
|
|
|
|
return result
|
2018-01-12 10:01:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-03-10 00:12:40 +01:00
|
|
|
|
fun getHttpBytes(url : String) : TootApiResult? {
|
|
|
|
|
val result = TootApiResult.makeWithCaption(url)
|
|
|
|
|
if(result.error != null) return result
|
|
|
|
|
|
|
|
|
|
if(! sendRequest(result, progressPath = url) {
|
|
|
|
|
Request.Builder().url(url).build()
|
|
|
|
|
}) return result
|
|
|
|
|
return parseBytes(result)
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-21 13:46:36 +01:00
|
|
|
|
fun webSocket(path : String, ws_listener : WebSocketListener) : TootApiResult? {
|
2018-01-12 10:01:25 +01:00
|
|
|
|
val result = TootApiResult.makeWithCaption(instance)
|
|
|
|
|
if(result.error != null) return result
|
|
|
|
|
val account = this.account ?: return TootApiResult("account is null")
|
|
|
|
|
try {
|
|
|
|
|
var url = "wss://$instance$path"
|
2018-01-04 19:52:25 +01:00
|
|
|
|
|
2018-01-13 07:15:52 +01:00
|
|
|
|
val request_builder = Request.Builder()
|
2018-01-21 13:46:36 +01:00
|
|
|
|
|
2018-01-12 10:01:25 +01:00
|
|
|
|
val access_token = account.getAccessToken()
|
|
|
|
|
if(access_token?.isNotEmpty() == true) {
|
|
|
|
|
val delm = if(- 1 != url.indexOf('?')) '&' else '?'
|
2018-01-21 13:46:36 +01:00
|
|
|
|
url = url + delm + "access_token=" + access_token.encodePercent()
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-01-13 07:15:52 +01:00
|
|
|
|
val request = request_builder.url(url).build()
|
2018-01-12 10:01:25 +01:00
|
|
|
|
publishApiProgress(context.getString(R.string.request_api, request.method(), path))
|
|
|
|
|
val ws = httpClient.getWebSocket(request, ws_listener)
|
|
|
|
|
if(isApiCancelled) {
|
|
|
|
|
ws.cancel()
|
|
|
|
|
return null
|
|
|
|
|
}
|
|
|
|
|
result.data = ws
|
2018-01-04 19:52:25 +01:00
|
|
|
|
} catch(ex : Throwable) {
|
|
|
|
|
log.trace(ex)
|
2018-01-21 13:46:36 +01:00
|
|
|
|
result.error =
|
|
|
|
|
"${result.caption}: ${ex.withCaption(context.resources, R.string.network_error)}"
|
2018-01-04 19:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
return result
|
|
|
|
|
|
|
|
|
|
}
|
2018-08-20 19:37:42 +02:00
|
|
|
|
|
2018-08-30 14:33:22 +02:00
|
|
|
|
}
|
|
|
|
|
|
2018-10-07 19:57:19 +02:00
|
|
|
|
fun TootApiClient.syncAccountByUrl(accessInfo : SavedAccount, who_url : String) : TootApiResult? {
|
|
|
|
|
|
2018-09-20 18:41:04 +02:00
|
|
|
|
// misskey由来のアカウントURLは https://host/@user@instance などがある
|
|
|
|
|
val m = TootAccount.reAccountUrl.matcher(who_url)
|
2018-10-07 19:57:19 +02:00
|
|
|
|
if(m.find()) {
|
2018-09-20 18:41:04 +02:00
|
|
|
|
// val host = m.group(1)
|
|
|
|
|
val user = m.group(2).unescapeUri()
|
|
|
|
|
val instance = m.groupOrNull(3)?.unescapeUri()
|
2018-10-07 19:57:19 +02:00
|
|
|
|
if(instance?.isNotEmpty() == true) {
|
|
|
|
|
return this.syncAccountByUrl(accessInfo, "https://$instance/@$user")
|
2018-09-20 18:41:04 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-30 14:33:22 +02:00
|
|
|
|
if(accessInfo.isMisskey) {
|
2018-08-28 14:25:45 +02:00
|
|
|
|
val acct = TootAccount.getAcctFromUrl(who_url)
|
|
|
|
|
?: return TootApiResult(context.getString(R.string.user_id_conversion_failed))
|
|
|
|
|
|
|
|
|
|
val delm = acct.indexOf('@')
|
|
|
|
|
val params = accessInfo.putMisskeyApiToken(JSONObject())
|
2018-08-30 14:33:22 +02:00
|
|
|
|
if(delm != - 1) {
|
|
|
|
|
params.put("username", acct.substring(0, delm))
|
|
|
|
|
params.put("host", acct.substring(delm + 1))
|
|
|
|
|
} else {
|
|
|
|
|
params.put("username", acct)
|
2018-08-28 14:25:45 +02:00
|
|
|
|
}
|
2018-08-30 14:33:22 +02:00
|
|
|
|
|
|
|
|
|
val result = this.request("/api/users/show", params.toPostRequestBuilder())
|
2018-08-28 14:25:45 +02:00
|
|
|
|
val jsonObject = result?.jsonObject
|
|
|
|
|
|
|
|
|
|
if(jsonObject != null) {
|
2018-08-30 14:33:22 +02:00
|
|
|
|
val tmp = TootParser(this.context, accessInfo).account(jsonObject)
|
|
|
|
|
if(tmp != null) {
|
2018-08-28 14:25:45 +02:00
|
|
|
|
result.data = tmp
|
|
|
|
|
} else {
|
|
|
|
|
result.setError(context.getString(R.string.user_id_conversion_failed))
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return result
|
2018-08-30 14:33:22 +02:00
|
|
|
|
} else {
|
2018-08-28 14:25:45 +02:00
|
|
|
|
val path = String.format(
|
|
|
|
|
Locale.JAPAN,
|
|
|
|
|
Column.PATH_SEARCH,
|
|
|
|
|
who_url.encodePercent()
|
|
|
|
|
) + "&resolve=1"
|
|
|
|
|
val result = this.request(path)
|
|
|
|
|
val jsonObject = result?.jsonObject
|
|
|
|
|
if(jsonObject != null) {
|
2018-08-30 14:33:22 +02:00
|
|
|
|
val tmp = TootParser(this.context, accessInfo).results(jsonObject)
|
2018-08-28 14:25:45 +02:00
|
|
|
|
if(tmp != null && tmp.accounts.isNotEmpty()) {
|
|
|
|
|
result.data = tmp.accounts[0].get()
|
|
|
|
|
} else {
|
|
|
|
|
result.setError(context.getString(R.string.user_id_conversion_failed))
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return result
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-08-20 19:37:42 +02:00
|
|
|
|
|
2018-08-30 14:33:22 +02:00
|
|
|
|
fun TootApiClient.syncAccountByAcct(accessInfo : SavedAccount, acct : String) : TootApiResult? {
|
|
|
|
|
if(accessInfo.isMisskey) {
|
2018-08-28 14:25:45 +02:00
|
|
|
|
val delm = acct.indexOf('@')
|
|
|
|
|
val params = accessInfo.putMisskeyApiToken(JSONObject())
|
2018-08-30 14:33:22 +02:00
|
|
|
|
if(delm != - 1) {
|
|
|
|
|
params.put("username", acct.substring(0, delm))
|
|
|
|
|
params.put("host", acct.substring(delm + 1))
|
|
|
|
|
} else {
|
|
|
|
|
params.put("username", acct)
|
2018-08-28 14:25:45 +02:00
|
|
|
|
}
|
|
|
|
|
|
2018-08-30 14:33:22 +02:00
|
|
|
|
val result = this.request("/api/users/show", params.toPostRequestBuilder())
|
2018-08-28 14:25:45 +02:00
|
|
|
|
val jsonObject = result?.jsonObject
|
|
|
|
|
|
|
|
|
|
if(jsonObject != null) {
|
2018-08-30 14:33:22 +02:00
|
|
|
|
val tmp = TootParser(this.context, accessInfo).account(jsonObject)
|
|
|
|
|
if(tmp != null) {
|
2018-08-28 14:25:45 +02:00
|
|
|
|
result.data = tmp
|
|
|
|
|
} else {
|
|
|
|
|
result.setError(context.getString(R.string.user_id_conversion_failed))
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return result
|
2018-08-30 14:33:22 +02:00
|
|
|
|
} else {
|
2018-08-28 14:25:45 +02:00
|
|
|
|
val path = String.format(
|
|
|
|
|
Locale.JAPAN,
|
|
|
|
|
Column.PATH_SEARCH,
|
|
|
|
|
acct.encodePercent()
|
|
|
|
|
) + "&resolve=1"
|
|
|
|
|
val result = this.request(path)
|
|
|
|
|
val jsonObject = result?.jsonObject
|
|
|
|
|
if(jsonObject != null) {
|
2018-08-30 14:33:22 +02:00
|
|
|
|
val tmp = TootParser(this.context, accessInfo).results(jsonObject)
|
2018-08-28 14:25:45 +02:00
|
|
|
|
if(tmp != null && tmp.accounts.isNotEmpty()) {
|
|
|
|
|
result.data = tmp.accounts[0].get()
|
|
|
|
|
} else {
|
|
|
|
|
result.setError(context.getString(R.string.user_id_conversion_failed))
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return result
|
|
|
|
|
}
|
2018-08-30 14:33:22 +02:00
|
|
|
|
}
|
|
|
|
|
|
2018-11-27 17:53:27 +01:00
|
|
|
|
fun TootApiClient.syncStatus(accessInfo : SavedAccount, urlArg : String) : TootApiResult? {
|
|
|
|
|
|
|
|
|
|
var url = urlArg
|
|
|
|
|
|
|
|
|
|
// misskey の投稿URLは外部タンスの投稿を複製したものの可能性がある
|
|
|
|
|
// これを投稿元タンスのURLに変換しないと、投稿の同期には使えない
|
|
|
|
|
val m = TootStatus.reStatusPageMisskey.matcher(urlArg)
|
|
|
|
|
if(m.find()) {
|
2018-11-27 18:42:55 +01:00
|
|
|
|
val host = m.group(1)
|
|
|
|
|
val noteId = m.group(2)
|
|
|
|
|
|
2018-12-08 07:26:19 +01:00
|
|
|
|
TootApiClient(context, callback = callback)
|
|
|
|
|
|
2018-11-27 18:42:55 +01:00
|
|
|
|
.apply { instance = host }
|
2018-12-08 07:26:19 +01:00
|
|
|
|
|
2018-11-27 18:42:55 +01:00
|
|
|
|
.request(
|
|
|
|
|
"/api/notes/show",
|
|
|
|
|
JSONObject()
|
|
|
|
|
.put("noteId", noteId)
|
|
|
|
|
.toPostRequestBuilder()
|
2018-12-08 07:26:19 +01:00
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
?.also { result ->
|
|
|
|
|
TootParser(
|
|
|
|
|
context,
|
|
|
|
|
LinkHelper.newLinkHelper(host, isMisskey = true),
|
|
|
|
|
serviceType = ServiceType.MISSKEY
|
|
|
|
|
)
|
|
|
|
|
.status(result.jsonObject)
|
|
|
|
|
?.apply {
|
|
|
|
|
if(host.equals(accessInfo.host, ignoreCase = true)) {
|
|
|
|
|
result.data = this
|
|
|
|
|
return result
|
|
|
|
|
}
|
|
|
|
|
uri.letNotEmpty { url = it }
|
|
|
|
|
}
|
2018-11-27 17:53:27 +01:00
|
|
|
|
}
|
2018-12-08 07:26:19 +01:00
|
|
|
|
|
|
|
|
|
?: return null // cancelled.
|
2018-11-27 17:53:27 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-12-08 07:26:19 +01:00
|
|
|
|
// 使いたいタンス上の投稿IDを取得する
|
|
|
|
|
val parser = TootParser(context, accessInfo)
|
|
|
|
|
return when {
|
|
|
|
|
|
|
|
|
|
accessInfo.isMisskey -> request(
|
|
|
|
|
"/api/ap/show",
|
|
|
|
|
accessInfo.putMisskeyApiToken()
|
|
|
|
|
.put("uri", url)
|
|
|
|
|
.toPostRequestBuilder()
|
|
|
|
|
)?.apply {
|
|
|
|
|
data = parser.parseMisskeyApShow(jsonObject)
|
2018-08-30 14:33:22 +02:00
|
|
|
|
}
|
2018-10-07 19:57:19 +02:00
|
|
|
|
|
2018-12-08 07:26:19 +01:00
|
|
|
|
else -> request(
|
|
|
|
|
"/api/v1/search?q=${url.encodePercent()}&resolve=true"
|
|
|
|
|
)?.apply {
|
|
|
|
|
data = parser.results(jsonObject)?.statuses?.firstOrNull()
|
2018-10-07 19:57:19 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2018-11-27 17:53:27 +01:00
|
|
|
|
}
|
2018-10-07 19:57:19 +02:00
|
|
|
|
|
2018-08-30 14:33:22 +02:00
|
|
|
|
fun TootApiClient.syncStatus(
|
|
|
|
|
accessInfo : SavedAccount,
|
|
|
|
|
statusRemote : TootStatus
|
|
|
|
|
) : TootApiResult? {
|
2018-08-30 15:06:23 +02:00
|
|
|
|
|
2018-10-07 19:57:19 +02:00
|
|
|
|
// URL->URIの順に試す
|
2018-08-30 15:06:23 +02:00
|
|
|
|
|
2018-10-07 19:57:19 +02:00
|
|
|
|
val uriList = ArrayList<String>(2)
|
2018-10-31 03:53:35 +01:00
|
|
|
|
|
2018-12-08 07:26:19 +01:00
|
|
|
|
statusRemote.url.letNotEmpty {
|
2018-10-31 03:53:35 +01:00
|
|
|
|
if(it.contains("/notes/")) {
|
2018-08-30 14:33:22 +02:00
|
|
|
|
// Misskeyタンスから読んだマストドンの投稿はurlがmisskeyタンス上のものになる
|
2018-10-07 19:57:19 +02:00
|
|
|
|
// ActivityPub object id としては不適切なので使わない
|
2018-10-31 03:53:35 +01:00
|
|
|
|
} else {
|
2018-10-07 19:57:19 +02:00
|
|
|
|
uriList.add(it)
|
2018-08-30 14:33:22 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2018-10-31 03:53:35 +01:00
|
|
|
|
|
2018-12-08 07:26:19 +01:00
|
|
|
|
statusRemote.uri.letNotEmpty {
|
2018-10-07 19:57:19 +02:00
|
|
|
|
// uri の方は↑の問題はない
|
|
|
|
|
uriList.add(it)
|
|
|
|
|
}
|
2018-08-30 14:33:22 +02:00
|
|
|
|
|
2018-12-08 07:26:19 +01:00
|
|
|
|
if(accessInfo.isMisskey && uriList.firstOrNull()?.contains("@") == true) {
|
2018-10-07 19:57:19 +02:00
|
|
|
|
// https://github.com/syuilo/misskey/pull/2832
|
|
|
|
|
// @user を含むuri はMisskeyだと少し効率が悪いそうなので順序を入れ替える
|
|
|
|
|
uriList.reverse()
|
2018-08-30 14:33:22 +02:00
|
|
|
|
}
|
2018-10-07 19:57:19 +02:00
|
|
|
|
|
2018-10-31 03:53:35 +01:00
|
|
|
|
for(uri in uriList) {
|
2018-10-07 19:57:19 +02:00
|
|
|
|
val result = syncStatus(accessInfo, uri)
|
|
|
|
|
if(result == null || result.data is TootStatus) {
|
|
|
|
|
return result
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TootApiResult("can't resolve status URL/URI.")
|
2018-12-02 10:35:04 +01:00
|
|
|
|
}
|