From 0535901aea9a888fcc9770893a5373942e585bfd Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Sun, 23 Apr 2023 03:01:21 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E6=95=B4=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subwaytooter/action/Action_Account.kt      |  1 +
 .../subwaytooter/actpost/ActPostMushroom.kt    |  3 +--
 .../subwaytooter/api/entity/TootStatus.kt      |  4 +++-
 .../jp/juggler/subwaytooter/util/PostImpl.kt   | 18 ++++++++++--------
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/action/Action_Account.kt b/app/src/main/java/jp/juggler/subwaytooter/action/Action_Account.kt
index 5872d085..65418900 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/action/Action_Account.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/action/Action_Account.kt
@@ -56,6 +56,7 @@ fun isAndroid7TlsBug(errorText: String) =
  * - 選択されたアクションに応じて分岐する。
  */
 fun ActMain.accountAdd() {
+    @Suppress("UNUSED_ANONYMOUS_PARAMETER")
     showLoginForm { dialogHost, apiHost, serverInfo, action ->
         launchMain {
             try {
diff --git a/app/src/main/java/jp/juggler/subwaytooter/actpost/ActPostMushroom.kt b/app/src/main/java/jp/juggler/subwaytooter/actpost/ActPostMushroom.kt
index 83142baf..995f630e 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/actpost/ActPostMushroom.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/actpost/ActPostMushroom.kt
@@ -1,6 +1,5 @@
 package jp.juggler.subwaytooter.actpost
 
-import android.annotation.SuppressLint
 import android.content.Intent
 import android.net.Uri
 import android.text.Spannable
@@ -26,7 +25,7 @@ fun ActPost.resetMushroom() {
     states.mushroomEnd = 0
 }
 
-fun ActPost.openPluginList(){
+fun ActPost.openPluginList() {
     val url = "https://github.com/tateisu/SubwayTooter/wiki/Simeji-Mushroom-Plugins"
     startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
 }
diff --git a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootStatus.kt b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootStatus.kt
index fc1fb971..589fa3cf 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootStatus.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootStatus.kt
@@ -1008,7 +1008,9 @@ class TootStatus(
 
                     // kmy.blue拡張
                     // https://github.com/kmycode/mastodon/wiki/%E3%83%A1%E3%83%87%E3%82%A3%E3%82%A2%E6%8B%A1%E5%BC%B5API
-                    parseListOrNull(  src.jsonArray("media_attachments_ex")) {
+                    // そのうちなくなるらしい
+                    // https://kmy.blue/@askyq/110241555669354847
+                    parseListOrNull(src.jsonArray("media_attachments_ex")) {
                         tootAttachment(parser, it)
                     }?.notEmpty()?.let {
                         when (val list = media_attachments) {
diff --git a/app/src/main/java/jp/juggler/subwaytooter/util/PostImpl.kt b/app/src/main/java/jp/juggler/subwaytooter/util/PostImpl.kt
index 63a5e512..43dc016c 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/util/PostImpl.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/util/PostImpl.kt
@@ -243,6 +243,7 @@ class PostImpl(
                         json["visibleUserIds"] = userIds
                         "specified"
                     }
+
                     account.misskeyVersion >= 11 -> "specified"
                     else -> "private"
                 }
@@ -322,15 +323,15 @@ class PostImpl(
                     add(a.id.toString())
                 }
             }
-            attachmentList.mapNotNull {a->
+            attachmentList.mapNotNull { a ->
                 buildJsonObject {
-                    put("id",a.id.toString())
-                    a.updateDescription?.let{ put("description",it)}
-                    a.updateThumbnail?.let{ put("thumbnail",it)}
-                    a.updateFocus?.let{ put("focus",it)}
-                }.takeIf { it.keys.size >= 2  }
-            }.let{
-                json["media_attributes"] = it.toJsonArray()
+                    put("id", a.id.toString())
+                    a.updateDescription?.let { put("description", it) }
+                    a.updateThumbnail?.let { put("thumbnail", it) }
+                    a.updateFocus?.let { put("focus", it) }
+                }.takeIf { it.keys.size >= 2 }
+            }.notEmpty()?.toJsonArray()?.let {
+                json["media_attributes"] = it
             }
         }
 
@@ -586,6 +587,7 @@ class PostImpl(
                                 when {
                                     account.isMisskey -> jsonObject?.jsonObject("createdNote")
                                         ?: jsonObject
+
                                     else -> jsonObject
                                 }
                             )