Merge pull request #1943 from samunohito/feature/support_renote_in_ch…

…annel feat: チャンネル内のノートをチャンネル内・チャンネル外にリノート出来るようメニューを拡張
pantasystem · Nov 6, 2023 · 14a9f53 · 14a9f53
2 parents 6c13fde + 1515ca9
commit 14a9f53
Show file tree

Hide file tree

Showing 21 changed files with 282 additions and 89 deletions.
diff --git a/app/src/test/java/jp/panta/misskeyandroidclient/api/misskey/v12/channel/ChannelDTOTest.kt b/app/src/test/java/jp/panta/misskeyandroidclient/api/misskey/v12/channel/ChannelDTOTest.kt
@@ -49,7 +49,7 @@ class ChannelDTOTest {
         assertEquals(channelDTO.isFollowing, channel.isFollowing)
         assertEquals(channelDTO.hasUnreadNote, channel.hasUnreadNote)
         assertEquals(channelDTO.name, channel.name)
-
+        assertEquals(channelDTO.allowRenoteToExternal, channel.allowRenoteToExternal)
     }
 
     @Test

diff --git a/app/src/test/java/jp/panta/misskeyandroidclient/model/channel/ChannelStateTest.kt b/app/src/test/java/jp/panta/misskeyandroidclient/model/channel/ChannelStateTest.kt
@@ -88,7 +88,8 @@ class ChannelStateTest {
             lastNotedAt = null,
             notesCount = 0,
             usersCount = 0,
-            userId = User.Id(id.accountId, "userId")
+            userId = User.Id(id.accountId, "userId"),
+            allowRenoteToExternal = true,
         )
     }
 

diff --git a/modules/api/src/main/java/net/pantasystem/milktea/api/misskey/v12/channel/channels.kt b/modules/api/src/main/java/net/pantasystem/milktea/api/misskey/v12/channel/channels.kt
@@ -46,6 +46,10 @@ data class ChannelDTO(
 
     @SerialName("isFollowing")
     val isFollowing: Boolean? = null,
+
+    // この値が含まれていなかった時は合わせてtrueにする（本体側のDB定義側はデフォルト値がtrueになっている）
+    @SerialName("allowRenoteToExternal")
+    val allowRenoteToExternal: Boolean = true
 ) {
     fun toModel(account: Account): Channel {
         return Channel(
@@ -59,7 +63,8 @@ data class ChannelDTO(
             usersCount = usersCount,
             userId = userId?.let { User.Id(account.accountId, it) },
             hasUnreadNote = hasUnreadNote,
-            isFollowing = isFollowing
+            isFollowing = isFollowing,
+            allowRenoteToExternal = allowRenoteToExternal,
         )
     }
 }

diff --git a/modules/common_resource/src/main/res/values-ja/strings.xml b/modules/common_resource/src/main/res/values-ja/strings.xml
@@ -23,7 +23,9 @@
     <string name="following">フォロー中</string>
     <string name="follower">フォロワー</string>
     <string name="renote">リポスト</string>
+    <string name="renote_in_channel">チャンネル内にリポスト</string>
     <string name="quote_renote">引用</string>
+    <string name="quote_renote_in_channel">チャンネル内に引用</string>
     <string name="discovery">discovery</string>
     <string name="renote_was">リポストしました</string>
     <string name="input_custom_emoji">絵文字/カスタム絵文字を入力</string>

diff --git a/modules/common_resource/src/main/res/values-zh/strings.xml b/modules/common_resource/src/main/res/values-zh/strings.xml
@@ -23,7 +23,9 @@
     <string name="following">关注中</string>
     <string name="follower">关注者</string>
     <string name="renote">转发</string>
+    <string name="renote_in_channel">频道内转发</string>
     <string name="quote_renote">引用转发</string>
+    <string name="quote_renote_in_channel">频道内引用转发</string>
     <string name="discovery">发现</string>
     <string name="renote_was">转发</string>
     <string name="input_custom_emoji">自定义表情</string>

diff --git a/modules/common_resource/src/main/res/values/strings.xml b/modules/common_resource/src/main/res/values/strings.xml
@@ -23,7 +23,9 @@
     <string name="following">Following</string>
     <string name="follower">Followers</string>
     <string name="renote">Renote</string>
+    <string name="renote_in_channel">Renote in channel</string>
     <string name="quote_renote">Quote renote</string>
+    <string name="quote_renote_in_channel">Quote renote in channel</string>
     <string name="discovery">Discovery</string>
     <string name="renote_was">Renote</string>
     <string name="input_custom_emoji">Emoji</string>

diff --git a/...ata/src/main/java/net/pantasystem/milktea/data/infrastructure/note/impl/NoteApiAdapter.kt b/...ata/src/main/java/net/pantasystem/milktea/data/infrastructure/note/impl/NoteApiAdapter.kt
@@ -27,6 +27,7 @@ import net.pantasystem.milktea.model.note.CreateNote
 import net.pantasystem.milktea.model.note.Note
 import net.pantasystem.milktea.model.note.NoteState
 import net.pantasystem.milktea.model.note.poll.Poll
+import net.pantasystem.milktea.model.note.repost.CreateRenote
 import net.pantasystem.milktea.model.note.type4Mastodon
 import javax.inject.Inject
 
@@ -43,7 +44,7 @@ interface NoteApiAdapter {
     suspend fun delete(noteId: Note.Id): DeleteNoteResultType
     suspend fun createThreadMute(noteId: Note.Id): ToggleThreadMuteResultType
     suspend fun deleteThreadMute(noteId: Note.Id): ToggleThreadMuteResultType
-    suspend fun renote(target: Note): RenoteResultType
+    suspend fun renote(createRenote: CreateRenote): RenoteResultType
 
     suspend fun vote(noteId: Note.Id, choice: Poll.Choice, target: Note)
 
@@ -59,16 +60,17 @@ internal class NoteApiAdapterFactoryImpl @Inject constructor(
     private val uploader: FileUploaderProvider,
     private val filePropertyDataSource: FilePropertyDataSource,
     private val loggerFactory: Logger.Factory,
-): NoteApiAdapter.Factory {
+) : NoteApiAdapter.Factory {
     override suspend fun create(account: Account): NoteApiAdapter {
-        return when(account.instanceType) {
+        return when (account.instanceType) {
             Account.InstanceType.MISSKEY, Account.InstanceType.FIREFISH -> NoteApiAdapterMisskeyPattern(
                 accountRepository = accountRepository,
                 misskeyAPIProvider = misskeyAPIProvider,
                 filePropertyDataSource = filePropertyDataSource,
                 uploader = uploader,
                 loggerFactory = loggerFactory,
             )
+
             Account.InstanceType.MASTODON, Account.InstanceType.PLEROMA -> NoteApiAdapterMastodonPattern(
                 uploader = uploader,
                 mastodonAPIProvider = mastodonAPIProvider,
@@ -77,6 +79,7 @@ internal class NoteApiAdapterFactoryImpl @Inject constructor(
         }
     }
 }
+
 private class NoteApiAdapterMisskeyPattern(
     val accountRepository: AccountRepository,
     val misskeyAPIProvider: MisskeyAPIProvider,
@@ -150,14 +153,14 @@ private class NoteApiAdapterMisskeyPattern(
         return ToggleThreadMuteResultType.Misskey
     }
 
-    override suspend fun renote(target: Note): RenoteResultType {
-        val account = accountRepository.get(target.id.accountId).getOrThrow()
+    override suspend fun renote(createRenote: CreateRenote): RenoteResultType {
         return create(
             CreateNote(
-                author = account, renoteId = target.id,
+                author = createRenote.author,
+                renoteId = createRenote.renoteId,
+                channelId = createRenote.channelId,
                 text = null,
-                visibility = target.visibility,
-                channelId = target.channelId,
+                visibility = createRenote.visibility,
             )
         )
     }
@@ -213,6 +216,7 @@ private class NoteApiAdapterMastodonPattern(
                             uploader.get(createNote.author)
                                 .upload(UploadSource.LocalFile(appFile), false).id
                         }
+
                         is AppFile.Remote -> appFile.id
                     }
                 }
@@ -276,9 +280,9 @@ private class NoteApiAdapterMastodonPattern(
         return ToggleThreadMuteResultType.Mastodon(requireNotNull(body))
     }
 
-    override suspend fun renote(target: Note): RenoteResultType {
-        val account = accountRepository.get(target.id.accountId).getOrThrow()
-        val toot = mastodonAPIProvider.get(account).reblog(target.id.noteId)
+    override suspend fun renote(createRenote: CreateRenote): RenoteResultType {
+        val account = accountRepository.get(createRenote.author.accountId).getOrThrow()
+        val toot = mastodonAPIProvider.get(account).reblog(createRenote.renoteId.noteId)
             .throwIfHasError()
             .body()
         return NoteResultType.Mastodon(requireNotNull(toot))

diff --git a/...src/main/java/net/pantasystem/milktea/data/infrastructure/note/impl/NoteRepositoryImpl.kt b/...src/main/java/net/pantasystem/milktea/data/infrastructure/note/impl/NoteRepositoryImpl.kt
@@ -23,6 +23,7 @@ import net.pantasystem.milktea.model.note.NoteResult
 import net.pantasystem.milktea.model.note.NoteState
 import net.pantasystem.milktea.model.note.NoteThreadContext
 import net.pantasystem.milktea.model.note.poll.Poll
+import net.pantasystem.milktea.model.note.repost.CreateRenote
 import javax.inject.Inject
 
 class NoteRepositoryImpl @Inject constructor(
@@ -41,11 +42,9 @@ class NoteRepositoryImpl @Inject constructor(
         }
     }
 
-    override suspend fun renote(noteId: Note.Id): Result<Note> = runCancellableCatching {
+    override suspend fun renote(createRenote: CreateRenote): Result<Note> = runCancellableCatching {
         withContext(ioDispatcher) {
-            val account = getAccount.get(noteId.accountId)
-            val n = find(noteId).getOrThrow()
-            convertAndAdd(account, noteApiAdapterFactory.create(account).renote(n))
+            convertAndAdd(createRenote.author, noteApiAdapterFactory.create(createRenote.author).renote(createRenote))
         }
     }
 

diff --git a/modules/features/channel/src/main/java/net/pantasystem/milktea/channel/ChannelCard.kt b/modules/features/channel/src/main/java/net/pantasystem/milktea/channel/ChannelCard.kt
@@ -225,7 +225,8 @@ fun PreviewChannelCard() {
                     userId = User.Id(0, "userId"),
                     usersCount = 4,
                     isFollowing = true,
-                    hasUnreadNote = true
+                    hasUnreadNote = true,
+                    allowRenoteToExternal = true,
                 ),
                 isPaged = true,
             )
@@ -243,7 +244,8 @@ fun PreviewChannelCard() {
                     userId = User.Id(0, "userId"),
                     usersCount = 4,
                     isFollowing = false,
-                    hasUnreadNote = false
+                    hasUnreadNote = false,
+                    allowRenoteToExternal = true,
                 ), isPaged = false
             )
         }
@@ -260,7 +262,8 @@ fun PreviewChannelCard() {
                     userId = User.Id(0, "userId"),
                     usersCount = 4,
                     isFollowing = false,
-                    hasUnreadNote = false
+                    hasUnreadNote = false,
+                    allowRenoteToExternal = true,
                 ), isPaged = false
             )
         }

diff --git a/...eatures/note/src/main/java/net/pantasystem/milktea/note/renote/RenoteBottomSheetDialog.kt b/...eatures/note/src/main/java/net/pantasystem/milktea/note/renote/RenoteBottomSheetDialog.kt
@@ -65,7 +65,6 @@ class RenoteBottomSheetDialog : BottomSheetDialogFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-
         return ComposeView(requireContext()).apply {
             setContent {
                 MilkteaStyleConfigApplyAndTheme(configRepository = configRepository) {
@@ -81,14 +80,23 @@ class RenoteBottomSheetDialog : BottomSheetDialogFragment() {
                             viewModel.renote()
                             dismiss()
                         },
+                        onQuoteRenoteButtonClicked = {
+                            notesViewModel.showQuoteNoteEditor(noteId)
+                            dismiss()
+                        },
+                        onRenoteInChannelButtonClicked = {
+                            viewModel.renoteToChannel()
+                            dismiss()
+                        },
+                        onQuoteInChannelRenoteButtonClicked = {
+                            notesViewModel.showQuoteToChannelNoteEditor(noteId)
+                            dismiss()
+                        },
                         onDeleteRenoteButtonCLicked = {
                             viewModel.unRenote()
                             dismiss()
                         },
-                        onQuoteRenoteButtonClicked = {
-                            notesViewModel.showQuoteNoteEditor(noteId)
-                            dismiss()
-                        })
+                    )
                 }
             }
         }

diff --git a/...les/features/note/src/main/java/net/pantasystem/milktea/note/renote/RenoteDialogLayout.kt b/...les/features/note/src/main/java/net/pantasystem/milktea/note/renote/RenoteDialogLayout.kt
@@ -19,6 +19,8 @@ fun RenoteDialogContent(
     onToggleAddAccount: (Long) -> Unit,
     onRenoteButtonClicked: () -> Unit,
     onQuoteRenoteButtonClicked: () -> Unit,
+    onRenoteInChannelButtonClicked: () -> Unit,
+    onQuoteInChannelRenoteButtonClicked: () -> Unit,
     onDeleteRenoteButtonCLicked: () -> Unit,
 ) {
     Surface(
@@ -33,11 +35,14 @@ fun RenoteDialogContent(
                 accounts = uiState.accounts,
                 onClick = onToggleAddAccount
             )
-            NormalBottomSheetDialogSelectionLayout(
-                onClick = onRenoteButtonClicked,
-                icon = Icons.Default.Repeat,
-                text = stringResource(id = R.string.renote)
-            )
+
+            if (uiState.isRenoteButtonVisible) {
+                NormalBottomSheetDialogSelectionLayout(
+                    onClick = onRenoteButtonClicked,
+                    icon = Icons.Default.Repeat,
+                    text = stringResource(id = R.string.renote)
+                )
+            }
 
             Spacer(modifier = Modifier.height(8.dp))
             if (isRenotedByMe) {
@@ -50,14 +55,31 @@ fun RenoteDialogContent(
 
             }
 
-
-            if (uiState.canQuote) {
+            if (uiState.isRenoteButtonVisible && uiState.canQuote) {
                 NormalBottomSheetDialogSelectionLayout(
                     onClick = onQuoteRenoteButtonClicked,
                     icon = Icons.Default.FormatQuote,
                     text = stringResource(id = R.string.quote_renote)
                 )
             }
+
+            if (uiState.isChannelRenoteButtonVisible) {
+                Spacer(modifier = Modifier.height(8.dp))
+                NormalBottomSheetDialogSelectionLayout(
+                    onClick = onRenoteInChannelButtonClicked,
+                    icon = Icons.Default.Repeat,
+                    text = stringResource(id = R.string.renote_in_channel)
+                )
+
+                if (uiState.canQuote) {
+                    Spacer(modifier = Modifier.height(8.dp))
+                    NormalBottomSheetDialogSelectionLayout(
+                        onClick = onQuoteInChannelRenoteButtonClicked,
+                        icon = Icons.Default.FormatQuote,
+                        text = stringResource(id = R.string.quote_renote_in_channel)
+                    )
+                }
+            }
         }
     }
 }
diff --git a/modules/features/note/src/main/java/net/pantasystem/milktea/note/renote/RenoteUiState.kt b/modules/features/note/src/main/java/net/pantasystem/milktea/note/renote/RenoteUiState.kt
@@ -13,6 +13,8 @@ data class RenoteViewModelUiState(
     ),
     val accounts: List<AccountInfo> = emptyList(),
     val canQuote: Boolean = true,
+    val isRenoteButtonVisible: Boolean = true,
+    val isChannelRenoteButtonVisible: Boolean = false,
 )
 
 data class RenoteViewModelTargetNoteState(

diff --git a/...s/features/note/src/main/java/net/pantasystem/milktea/note/renote/RenoteUiStateBuilder.kt b/...s/features/note/src/main/java/net/pantasystem/milktea/note/renote/RenoteUiStateBuilder.kt
@@ -10,8 +10,10 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import net.pantasystem.milktea.common.ResultState
+import net.pantasystem.milktea.common.coroutines.combine
 import net.pantasystem.milktea.common.initialState
 import net.pantasystem.milktea.model.account.Account
+import net.pantasystem.milktea.model.channel.Channel
 import net.pantasystem.milktea.model.instance.InstanceInfoService
 import net.pantasystem.milktea.model.instance.InstanceInfoType
 import net.pantasystem.milktea.model.note.Note
@@ -30,6 +32,7 @@ class RenoteUiStateBuilder @Inject constructor(
     fun buildState(
         targetNoteIdFlow: StateFlow<Note.Id?>,
         noteFlow: Flow<NoteRelation?>,
+        channelFlow: Flow<Channel?>,
         noteSyncState: Flow<ResultState<Unit>>,
         selectedAccountIds: Flow<List<Long>>,
         accountsFlow: Flow<List<Account>>,
@@ -106,17 +109,24 @@ class RenoteUiStateBuilder @Inject constructor(
             emptyList()
         )
 
+        val isRenoteButtonVisibleFlow = channelFlow.map { it?.allowRenoteToExternal ?: true }
+        val isChannelRenoteButtonVisibleFlow = channelFlow.map { it != null }
+
         return combine(
             targetNoteIdFlow,
             noteState,
             accountWithUsers,
             currentAccountInstanceInfo,
-        ) { noteId, syncState, accounts, instanceInfo ->
+            isRenoteButtonVisibleFlow,
+            isChannelRenoteButtonVisibleFlow,
+        ) { noteId, syncState, accounts, instanceInfo, isRenoteButtonVisible, isChannelRenoteButtonVisible ->
             RenoteViewModelUiState(
                 targetNoteId = noteId,
                 noteState = syncState,
                 accounts = accounts,
-                canQuote = instanceInfo?.canQuote ?: false
+                canQuote = instanceInfo?.canQuote ?: false,
+                isRenoteButtonVisible = isRenoteButtonVisible,
+                isChannelRenoteButtonVisible = isChannelRenoteButtonVisible,
             )
         }
     }