yilsem/aiturk-mobil
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

fix(chat): restrict @ bot mention suggestions strictly to group chat (#1052)

Browse Source
This commit is contained in:
M57 authored and GitHub committed 2026-09-03 19:46:38 +03:00
1 parent b3439d87c9
commit 5a79da96f7
3 files changed
-96
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
-1
View File
@@ -815,7 +815,6 @@ fun ChatScreen(
isAgentTyping = state.isAgentTyping,
isConnected = state.isConnected,
commandCatalog = state.commandCatalog,
availableBots = state.availableBots,
slashUsageCounts = state.slashUsageCounts,
pendingAttachments = state.pendingAttachments,
onCameraTap = {
app/src/main/java/com/m57/hermescontrol/ui/chat/ChatViewModel.kt
-10
View File
@@ -312,7 +312,6 @@ data class ChatUiState(
val typingEffectDelayMs: Int = 30,
// Commands catalog
val commandCatalog: CommandCatalog = CommandCatalog(),
val availableBots: List<ProfileInfo> = emptyList(),
// Per-command usage counts for the slash-autocomplete ranking (issue
// #865). Empty until the local store loads; commands without recorded
// usage keep their catalog order.
@@ -2205,15 +2204,6 @@ class ChatViewModel(
WsMethods.COMMANDS_CATALOG,
onSent = { id -> trackRequest(id, WsMethods.COMMANDS_CATALOG) },
)
// Fetch available bot profiles for @ autocomplete
val profilesResult = safeApiCall { ApiClient.hermesApi.getProfiles() }
if (profilesResult is NetworkResult.Success) {
val profiles =
profilesResult.data.profiles.orEmpty().filter {
!AuthManager.isProfileHidden(it.name) && it.botMeta()?.hidden != true
}
_uiState.update { it.copy(availableBots = profiles) }
}
}
}
app/src/main/java/com/m57/hermescontrol/ui/chat/components/ChatComposer.kt
-85
View File
@@ -91,7 +91,6 @@ fun ChatInputBar(
commandCatalog: CommandCatalog,
slashUsageCounts: Map<String, Int> = emptyMap(),
pendingAttachments: List<Attachment> = emptyList(),
availableBots: List<ProfileInfo> = emptyList(),
onCameraTap: () -> Unit = {},
onImageTap: () -> Unit = {},
onFileTap: () -> Unit = {},
@@ -190,90 +189,6 @@ fun ChatInputBar(
}
}
// Bot mention @ suggestions
val mentionQuery =
remember(inputFieldValue.text, inputFieldValue.selection.end) {
ChatInputPolicy.extractMentionQuery(
inputFieldValue.text,
inputFieldValue.selection.end,
)
}
androidx.compose.animation.AnimatedVisibility(
visible = mentionQuery != null && availableBots.isNotEmpty(),
enter = androidx.compose.animation.fadeIn() + androidx.compose.animation.expandVertically(),
exit = androidx.compose.animation.fadeOut() + androidx.compose.animation.shrinkVertically(),
) {
val filteredBots =
remember(mentionQuery, availableBots) {
if (mentionQuery == null) {
emptyList()
} else {
availableBots.filter { bot ->
bot.name.startsWith(mentionQuery, ignoreCase = true) ||
bot.effectiveTitle.contains(mentionQuery, ignoreCase = true)
}
}
}
if (filteredBots.isNotEmpty()) {
Surface(
modifier =
Modifier
.fillMaxWidth()
.padding(horizontal = 12.dp, vertical = 4.dp),
shape = RoundedCornerShape(12.dp),
color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f),
border =
BorderStroke(
1.dp,
MaterialTheme.colorScheme.outline.copy(alpha = 0.2f),
),
) {
LazyColumn(
modifier = Modifier.heightIn(max = 200.dp),
) {
items(filteredBots, key = { it.name }) { bot ->
Row(
modifier =
Modifier
.fillMaxWidth()
.clickable {
onInputChange(
ChatInputPolicy.applyMention(inputFieldValue, bot.name),
)
}.padding(horizontal = 12.dp, vertical = 8.dp),
verticalAlignment = Alignment.CenterVertically,
) {
BotAvatar(
name = bot.name,
avatar = bot.botMeta()?.avatar,
size = 28.dp,
showPresence = false,
)
Spacer(modifier = Modifier.width(8.dp))
Column {
Text(
text = "@${bot.name}",
fontWeight = FontWeight.Bold,
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.primary,
)
if (bot.effectiveTitle != bot.name) {
Text(
text = bot.effectiveTitle,
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
}
}
}
}
}
}
}
// Attachment preview chips
AnimatedVisibility(
visible = pendingAttachments.isNotEmpty(),