Sort command suggestions by availability based on the current message action.

Author: andremion

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/AttachmentCommandPicker.kt

@@ -28,6 +28,7 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -51,6 +52,7 @@ import io.getstream.chat.android.ui.common.state.messages.Edit
 import io.getstream.chat.android.ui.common.state.messages.MessageAction
 import io.getstream.chat.android.ui.common.state.messages.Reply
 import io.getstream.chat.android.ui.common.state.messages.composer.isAvailableFor
+import io.getstream.chat.android.ui.common.state.messages.composer.sortedByAvailability
 
 @Composable
 internal fun AttachmentCommandPicker(
@@ -76,9 +78,12 @@ internal fun AttachmentCommandPicker(
             style = ChatTheme.typography.headingSmall,
             color = ChatTheme.colors.textPrimary,
         )
+        val sortedCommands = remember(commands, messageAction) {
+            commands.sortedByAvailability(messageAction)
+        }
         LazyColumn(horizontalAlignment = Alignment.CenterHorizontally) {
             items(
-                items = commands,
+                items = sortedCommands,
                 key = Command::name,
             ) { command ->
                 CommandItem(

stream-chat-android-ui-common/src/main/kotlin/io/getstream/chat/android/ui/common/feature/messages/composer/MessageComposerController.kt

@@ -50,6 +50,7 @@ import io.getstream.chat.android.ui.common.state.messages.composer.MessageCompos
 import io.getstream.chat.android.ui.common.state.messages.composer.MessageValidator
 import io.getstream.chat.android.ui.common.state.messages.composer.RecordingState
 import io.getstream.chat.android.ui.common.state.messages.composer.isAvailableFor
+import io.getstream.chat.android.ui.common.state.messages.composer.sortedByAvailability
 import io.getstream.chat.android.ui.common.utils.AttachmentConstants
 import io.getstream.chat.android.ui.common.utils.extensions.addSchemeToUrlIfNeeded
 import io.getstream.chat.android.ui.common.utils.typing.TypingUpdatesBuffer
@@ -430,6 +431,9 @@ public class MessageComposerController(
         _messageActions.onEach { actions ->
             val activeAction = actions.lastOrNull { it is Edit || it is Reply }
             _state.update { it.copy(action = activeAction) }
+            // Re-derive command suggestions so the list re-sorts by availability for the new
+            // action and the edit-mode guard fires if a command is currently being typed.
+            handleCommandSuggestions()
         }.launchIn(scope)
 
         ownCapabilities.onEach { ownCapabilities ->
@@ -1065,9 +1069,15 @@ public class MessageComposerController(
      * Toggles the visibility of the command suggestion list popup.
      */
     public fun toggleCommandsVisibility() {
-        _state.update { s ->
-            val showCommands = s.commandSuggestions.isEmpty()
-            s.copy(commandSuggestions = if (showCommands) commands else emptyList())
+        _state.update {
+            val showCommands = it.commandSuggestions.isEmpty()
+            it.copy(
+                commandSuggestions = if (showCommands) {
+                    commands.sortedByAvailability(activeAction)
+                } else {
+                    emptyList()
+                },
+            )
         }
     }
 
@@ -1213,6 +1223,7 @@ public class MessageComposerController(
         val suggestions = if (containsCommand) {
             val commandPattern = messageText.removePrefix("/")
             commands.filter { it.name.startsWith(commandPattern) }
+                .sortedByAvailability(action)
         } else {
             emptyList()
         }

stream-chat-android-ui-common/src/main/kotlin/io/getstream/chat/android/ui/common/state/messages/composer/CommandAvailability.kt

@@ -41,4 +41,15 @@ public fun Command.isAvailableFor(action: MessageAction?): Boolean = when (actio
     else -> true
 }
 
+/**
+ * Returns a new list with commands available for [action] first, followed by unavailable ones.
+ * The sort is stable, so the original order is preserved within each availability group.
+ *
+ * @param action The composer action currently active, or `null` when the composer is in its
+ * default state.
+ */
+@InternalStreamChatApi
+public fun List<Command>.sortedByAvailability(action: MessageAction?): List<Command> =
+    sortedByDescending { it.isAvailableFor(action) }
+
 private const val MODERATION_COMMAND_SET: String = "moderation_set"

stream-chat-android-ui-common/src/test/kotlin/io/getstream/chat/android/ui/common/feature/messages/composer/MessageComposerControllerTest.kt

@@ -1048,6 +1048,35 @@ internal class MessageComposerControllerTest {
         }
     }
 
+    @Test
+    fun `Given slash typed When action becomes Reply Then suggestions re-sort by availability`() = runTest {
+        // Given: moderation command listed first, fun command second (default server order)
+        val muteCommand = Command("mute", "Mute user", "[@username]", "moderation_set")
+        val giphyCommand = Command("giphy", "Search GIFs", "[text]", "fun_set")
+        val repliedMessage = randomMessage(cid = CID)
+        val controller = Fixture()
+            .givenConfig(MessageComposerController.Config(activeCommandEnabled = true))
+            .givenAppSettings()
+            .givenAudioPlayer(mock())
+            .givenClientState(randomUser())
+            .givenGlobalState()
+            .givenChannelState(
+                configState = MutableStateFlow(Config(commands = listOf(muteCommand, giphyCommand))),
+            )
+            .get()
+        controller.setMessageInput("/")
+        advanceUntilIdle()
+        // Sanity: with no action, server order is preserved.
+        assertEquals(listOf(muteCommand, giphyCommand), controller.state.value.commandSuggestions)
+
+        // When
+        controller.performMessageAction(Reply(repliedMessage))
+        advanceUntilIdle()
+
+        // Then: available (giphy) first, unavailable (mute) last
+        assertEquals(listOf(giphyCommand, muteCommand), controller.state.value.commandSuggestions)
+    }
+
     @Test
     fun `Given reply mode When selectCommand called with fun_set command Then activeCommand is set`() = runTest {
         // Given