(Misskey 8.22移行)リストの削除と名前の変更
This commit is contained in:
parent
36a09004fd
commit
e51ed68e0b
|
@ -29,7 +29,7 @@
|
||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectType">
|
<component name="ProjectType">
|
||||||
|
|
|
@ -89,10 +89,6 @@ object Action_List {
|
||||||
list : TootList,
|
list : TootList,
|
||||||
bConfirmed : Boolean = false
|
bConfirmed : Boolean = false
|
||||||
) {
|
) {
|
||||||
if(access_info.isMisskey) {
|
|
||||||
showToast(activity, false, "Misskey has no API to delete list")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if(! bConfirmed) {
|
if(! bConfirmed) {
|
||||||
DlgConfirm.openSimple(
|
DlgConfirm.openSimple(
|
||||||
|
@ -107,7 +103,10 @@ object Action_List {
|
||||||
TootTaskRunner(activity).run(access_info, object : TootTask {
|
TootTaskRunner(activity).run(access_info, object : TootTask {
|
||||||
override fun background(client : TootApiClient) : TootApiResult? {
|
override fun background(client : TootApiClient) : TootApiResult? {
|
||||||
return if(access_info.isMisskey) {
|
return if(access_info.isMisskey) {
|
||||||
TootApiResult("Misskey has no API to delete list")
|
val params = access_info.putMisskeyApiToken()
|
||||||
|
.put("listId", list.id)
|
||||||
|
client.request("/api/users/lists/delete", params.toPostRequestBuilder())
|
||||||
|
// 204 no content
|
||||||
} else {
|
} else {
|
||||||
client.request("/api/v1/lists/{list.id}", Request.Builder().delete())
|
client.request("/api/v1/lists/{list.id}", Request.Builder().delete())
|
||||||
}
|
}
|
||||||
|
@ -136,10 +135,6 @@ object Action_List {
|
||||||
access_info : SavedAccount,
|
access_info : SavedAccount,
|
||||||
item : TootList
|
item : TootList
|
||||||
) {
|
) {
|
||||||
if(access_info.isMisskey) {
|
|
||||||
showToast(activity, false, "Misskey has no API to rename list")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
DlgTextInput.show(
|
DlgTextInput.show(
|
||||||
activity,
|
activity,
|
||||||
|
@ -154,11 +149,17 @@ object Action_List {
|
||||||
|
|
||||||
TootTaskRunner(activity).run(access_info, object : TootTask {
|
TootTaskRunner(activity).run(access_info, object : TootTask {
|
||||||
var list : TootList? = null
|
var list : TootList? = null
|
||||||
override fun background(client : TootApiClient) : TootApiResult? {
|
|
||||||
if(access_info.isMisskey) {
|
|
||||||
return TootApiResult("Misskey has no API to rename list")
|
|
||||||
}
|
|
||||||
|
|
||||||
|
override fun background(client : TootApiClient) : TootApiResult? {
|
||||||
|
val result = if(access_info.isMisskey) {
|
||||||
|
val params = access_info.putMisskeyApiToken()
|
||||||
|
.put("listId", item.id)
|
||||||
|
.put("title", text)
|
||||||
|
client.request(
|
||||||
|
"/api/users/lists/update",
|
||||||
|
params.toPostRequestBuilder()
|
||||||
|
)
|
||||||
|
} else {
|
||||||
val content = JSONObject()
|
val content = JSONObject()
|
||||||
try {
|
try {
|
||||||
content.put("title", text)
|
content.put("title", text)
|
||||||
|
@ -171,9 +172,9 @@ object Action_List {
|
||||||
TootApiClient.MEDIA_TYPE_JSON, content.toString()
|
TootApiClient.MEDIA_TYPE_JSON, content.toString()
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
val result =
|
|
||||||
client.request("/api/v1/lists/${item.id}", request_builder)
|
client.request("/api/v1/lists/${item.id}", request_builder)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
client.publishApiProgress(activity.getString(R.string.parsing_response))
|
client.publishApiProgress(activity.getString(R.string.parsing_response))
|
||||||
list = parseItem(
|
list = parseItem(
|
||||||
|
|
|
@ -913,7 +913,7 @@ class SavedAccount(
|
||||||
val misskeyApiToken : String?
|
val misskeyApiToken : String?
|
||||||
get() = token_info?.parseString(TootApiClient.KEY_API_KEY_MISSKEY)
|
get() = token_info?.parseString(TootApiClient.KEY_API_KEY_MISSKEY)
|
||||||
|
|
||||||
fun putMisskeyApiToken(params : JSONObject) : JSONObject {
|
fun putMisskeyApiToken(params : JSONObject =JSONObject()) : JSONObject {
|
||||||
val apiKey = misskeyApiToken
|
val apiKey = misskeyApiToken
|
||||||
if(apiKey?.isNotEmpty() == true) params.put("i", apiKey)
|
if(apiKey?.isNotEmpty() == true) params.put("i", apiKey)
|
||||||
return params
|
return params
|
||||||
|
|
Loading…
Reference in New Issue