Merge pull request #705 from Npepperlinux/reblog_target_exclude_direc…

…t_specifed Exclude canReblog target Direct/Specifed
DimensionDev · Feb 1, 2025 · 58a6934 · 58a6934
2 parents b9c0d07 + 8479d35
commit 58a6934
Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Mastodon.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Mastodon.kt
@@ -181,7 +181,7 @@ private fun Status.renderStatus(
     requireNotNull(account) { "actualStatus.account is null" }
     val actualUser = account.render(accountKey, host)
     val isFromMe = actualUser.key == accountKey
-    val canReblog = visibility in listOf(Visibility.Public, Visibility.Unlisted) || isFromMe
+    val canReblog = visibility in listOf(Visibility.Public, Visibility.Unlisted) || (isFromMe && visibility != Visibility.Direct)
     val statusKey =
         MicroBlogKey(
             id = id ?: throw IllegalArgumentException("mastodon Status.id should not be null"),

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
@@ -290,7 +290,7 @@ internal fun Note.renderStatus(
         }
     val user = user.render(accountKey)
     val isFromMe = user.key == accountKey
-    val canReblog = visibility in listOf(Visibility.Public, Visibility.Home) || isFromMe
+    val canReblog = visibility in listOf(Visibility.Public, Visibility.Home) || (isFromMe && visibility != Visibility.Specified)
     val renderedVisibility =
         when (visibility) {
             Visibility.Public -> UiTimeline.ItemContent.Status.TopEndContent.Visibility.Type.Public