(Misskey)投稿の削除
This commit is contained in:
parent
de57629ec3
commit
da23d2437b
|
@ -128,7 +128,8 @@ object Action_Toot {
|
|||
result = client.syncStatus(access_info, arg_status)
|
||||
if(result?.data == null) return result
|
||||
target_status = result.data as? TootStatus
|
||||
?: return TootApiResult(activity.getString(R.string.status_id_conversion_failed))
|
||||
?:
|
||||
return TootApiResult(activity.getString(R.string.status_id_conversion_failed))
|
||||
if(target_status.favourited) {
|
||||
return TootApiResult(activity.getString(R.string.already_favourited))
|
||||
}
|
||||
|
@ -377,7 +378,8 @@ object Action_Toot {
|
|||
result = client.syncStatus(access_info, arg_status)
|
||||
if(result?.data == null) return result
|
||||
target_status = result.data as? TootStatus
|
||||
?: return TootApiResult(activity.getString(R.string.status_id_conversion_failed))
|
||||
?:
|
||||
return TootApiResult(activity.getString(R.string.status_id_conversion_failed))
|
||||
if(target_status.reblogged) {
|
||||
return TootApiResult(activity.getString(R.string.already_boosted))
|
||||
}
|
||||
|
@ -496,9 +498,20 @@ object Action_Toot {
|
|||
|
||||
TootTaskRunner(activity).run(access_info, object : TootTask {
|
||||
override fun background(client : TootApiClient) : TootApiResult? {
|
||||
return if(access_info.isMisskey) {
|
||||
val params = access_info.putMisskeyApiToken()
|
||||
.put("noteId", status_id)
|
||||
|
||||
client.request("/api/notes/delete", params.toPostRequestBuilder())
|
||||
|
||||
// 204 no content
|
||||
|
||||
} else {
|
||||
val request_builder = Request.Builder().delete()
|
||||
|
||||
return client.request("/api/v1/statuses/$status_id", request_builder)
|
||||
client.request("/api/v1/statuses/$status_id", request_builder)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
override fun handleResult(result : TootApiResult?) {
|
||||
|
@ -531,7 +544,13 @@ object Action_Toot {
|
|||
override fun background(client : TootApiClient) : TootApiResult? {
|
||||
return client.request(
|
||||
"/api/v1/conversations/${conversationSummary.id}/read"
|
||||
,Request.Builder().post(RequestBody.create(TootApiClient.MEDIA_TYPE_FORM_URL_ENCODED,""))
|
||||
,
|
||||
Request.Builder().post(
|
||||
RequestBody.create(
|
||||
TootApiClient.MEDIA_TYPE_FORM_URL_ENCODED,
|
||||
""
|
||||
)
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -542,7 +561,6 @@ object Action_Toot {
|
|||
|
||||
}
|
||||
|
||||
|
||||
// ローカルかリモートか判断する
|
||||
fun conversation(
|
||||
activity : ActMain,
|
||||
|
@ -921,7 +939,8 @@ object Action_Toot {
|
|||
val result = client.syncStatus(access_info, remote_status_url)
|
||||
if(result?.data == null) return result
|
||||
local_status = result.data as? TootStatus
|
||||
?: return TootApiResult(activity.getString(R.string.status_id_conversion_failed))
|
||||
?:
|
||||
return TootApiResult(activity.getString(R.string.status_id_conversion_failed))
|
||||
return result
|
||||
}
|
||||
|
||||
|
@ -948,12 +967,23 @@ object Action_Toot {
|
|||
activity.post_helper.closeAcctPopup()
|
||||
|
||||
if(accessInfo.isMisskey) {
|
||||
ActPost.open(activity, ActMain.REQUEST_CODE_POST, accessInfo.db_id, redraft_status = status, reply_status = status.reply)
|
||||
ActPost.open(
|
||||
activity,
|
||||
ActMain.REQUEST_CODE_POST,
|
||||
accessInfo.db_id,
|
||||
redraft_status = status,
|
||||
reply_status = status.reply
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
if(status.in_reply_to_id == null) {
|
||||
ActPost.open(activity, ActMain.REQUEST_CODE_POST, accessInfo.db_id, redraft_status = status)
|
||||
ActPost.open(
|
||||
activity,
|
||||
ActMain.REQUEST_CODE_POST,
|
||||
accessInfo.db_id,
|
||||
redraft_status = status
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue