feat(talk): меню сообщения — Напоминание с пресетами (P1 talk.diff)

2026-07-13 07:15:40 +00:00
parent 958e14aead
commit bbaaf7ade2
6 changed files with 104 additions and 3 deletions
@@ -5,10 +5,10 @@
    <ID>ArgumentListWrapping:TalkComponents.kt$(message.attachmentFileName!!)</ID>
    <ID>CyclomaticComplexMethod:TalkFormatting.kt$fun buildChatItems( messages: List&lt;TalkMessage&gt;, lastReadMessageId: Long, selfActorId: String, collapseSystemMessages: Boolean, ): List&lt;TalkChatItem&gt;</ID>
    <ID>CyclomaticComplexMethod:TalkScreen.kt$@Composable fun TalkScreen( session: AuthSession, modifier: Modifier = Modifier, openRoomToken: String? = null, scrollToMessageId: Long? = null, chatsListRequest: Int = 0, pushSyncRequest: Int = 0, pushRoomToken: String? = null, onOpenRoomConsumed: () -&gt; Unit = {}, onRoomOpenStateChange: (Boolean) -&gt; Unit = {}, onOpenCalendar: () -&gt; Unit = {}, onUnauthorized: () -&gt; Unit = {}, )</ID>
-    <ID>CyclomaticComplexMethod:TalkScreen.kt$@Composable private fun ChatContent( session: AuthSession, state: TalkUiState, draft: String, onDraftChange: (String) -&gt; Unit, onSend: () -&gt; Unit, onAttach: () -&gt; Unit, onVoiceToggle: () -&gt; Unit, voiceRecording: Boolean, onRetry: () -&gt; Unit, onStartCall: () -&gt; Unit, onBackClick: () -&gt; Unit, onOpenRoomInfo: () -&gt; Unit, onScheduleMeeting: () -&gt; Unit, onToggleSystemMessages: () -&gt; Unit, onReply: (TalkMessage) -&gt; Unit, onReaction: (TalkMessage, String) -&gt; Unit, onDeleteMessage: (TalkMessage) -&gt; Unit, onEditMessage: (TalkMessage, String) -&gt; Unit, onForwardNoteToSelf: (TalkMessage) -&gt; Unit, onMentionQuery: (String?) -&gt; Unit, onMentionSelected: (TalkMention) -&gt; Unit, onClearReply: () -&gt; Unit, onClearHighlight: () -&gt; Unit, )</ID>
+    <ID>CyclomaticComplexMethod:TalkScreen.kt$@Composable private fun ChatContent( session: AuthSession, state: TalkUiState, draft: String, onDraftChange: (String) -&gt; Unit, onSend: () -&gt; Unit, onAttach: () -&gt; Unit, onVoiceToggle: () -&gt; Unit, voiceRecording: Boolean, onRetry: () -&gt; Unit, onStartCall: () -&gt; Unit, onBackClick: () -&gt; Unit, onOpenRoomInfo: () -&gt; Unit, onScheduleMeeting: () -&gt; Unit, onToggleSystemMessages: () -&gt; Unit, onReply: (TalkMessage) -&gt; Unit, onReaction: (TalkMessage, String) -&gt; Unit, onDeleteMessage: (TalkMessage) -&gt; Unit, onEditMessage: (TalkMessage, String) -&gt; Unit, onForwardNoteToSelf: (TalkMessage) -&gt; Unit, onSetReminder: (TalkMessage, ReminderPreset) -&gt; Unit, onMentionQuery: (String?) -&gt; Unit, onMentionSelected: (TalkMention) -&gt; Unit, onClearReply: () -&gt; Unit, onClearHighlight: () -&gt; Unit, )</ID>
    <ID>ImportOrdering:TalkComponents.kt$import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxScope import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalBottomSheet import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextFieldDefaults import androidx.compose.material3.Text import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.foundation.border import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.offset import androidx.compose.foundation.lazy.LazyRow import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.IconButton import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import coil.compose.SubcomposeAsyncImage import coil.request.ImageRequest import okhttp3.Credentials import ru.forbion.f7cloud.core.auth.AuthSession import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.shadow import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.graphicsLayer import coil.compose.AsyncImage import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.foundation.layout.widthIn import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.window.Popup import androidx.compose.ui.window.PopupProperties import ru.forbion.f7cloud.core.designsystem.F7Colors import ru.forbion.f7cloud.core.designsystem.F7PrimaryButton import ru.forbion.f7cloud.core.designsystem.F7TextButton import java.text.DateFormat import java.util.Calendar import java.util.Date import kotlin.math.abs</ID>
    <ID>ImportOrdering:TalkScreen.kt$import android.Manifest import android.content.Context import android.content.pm.PackageManager import android.widget.Toast import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.foundation.clickable import androidx.compose.foundation.gestures.awaitEachGesture import androidx.compose.foundation.gestures.awaitFirstDown import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.ui.draw.clip import androidx.compose.ui.input.pointer.PointerEventPass import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.material3.AlertDialog import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.pulltorefresh.PullToRefreshBox import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import kotlinx.coroutines.launch import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.unit.dp import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewmodel.compose.viewModel import coil.compose.AsyncImage import ru.forbion.f7cloud.core.auth.AuthSession import ru.forbion.f7cloud.core.designsystem.F7Colors import ru.forbion.f7cloud.core.designsystem.F7ModuleScreen import ru.forbion.f7cloud.core.designsystem.F7OverlayDismissHandler import ru.forbion.f7cloud.core.designsystem.F7TextButton import ru.forbion.f7cloud.feature.talknative.TalkNativeCallContext import ru.forbion.f7cloud.feature.talknative.TalkNativeCallLauncher</ID>
-    <ID>ImportOrdering:TalkViewModel.kt$import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.isActive import ru.forbion.f7cloud.core.auth.AuthSession import ru.forbion.f7cloud.core.designsystem.AppForegroundTracker import ru.forbion.f7cloud.core.network.UnauthorizedException</ID>
+    <ID>ImportOrdering:TalkViewModel.kt$import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.isActive import ru.forbion.f7cloud.core.auth.AuthSession import ru.forbion.f7cloud.core.designsystem.AppForegroundTracker import ru.forbion.f7cloud.core.network.UnauthorizedException import java.util.Calendar</ID>
    <ID>Indentation:TalkScreen.kt$ </ID>
    <ID>InstanceOfCheckForException:TalkViewModel.kt$TalkViewModel$t is UnauthorizedException</ID>
    <ID>LargeClass:TalkViewModel.kt$TalkViewModel : ViewModel</ID>
@@ -16,7 +16,7 @@
    <ID>LongMethod:TalkComponents.kt$@Composable fun TalkRoomRow( room: TalkRoom, session: AuthSession, modifier: Modifier = Modifier, onClick: () -&gt; Unit, onToggleFavorite: () -&gt; Unit = {}, onMarkUnread: () -&gt; Unit = {}, )</ID>
    <ID>LongMethod:TalkComponents.kt$@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class) @Composable fun TalkCreateRoomSheet( visible: Boolean, session: AuthSession, mode: CreateRoomMode, roomName: String, userSearchQuery: String, userSearchResults: List&lt;TalkUserCandidate&gt;, selectedUsers: List&lt;TalkUserCandidate&gt;, userSearchLoading: Boolean, creating: Boolean, onDismiss: () -&gt; Unit, onModeChange: (CreateRoomMode) -&gt; Unit, onRoomNameChange: (String) -&gt; Unit, onUserSearchChange: (String) -&gt; Unit, onUserToggle: (TalkUserCandidate) -&gt; Unit, onCreate: () -&gt; Unit, )</ID>
    <ID>LongMethod:TalkScreen.kt$@Composable fun TalkScreen( session: AuthSession, modifier: Modifier = Modifier, openRoomToken: String? = null, scrollToMessageId: Long? = null, chatsListRequest: Int = 0, pushSyncRequest: Int = 0, pushRoomToken: String? = null, onOpenRoomConsumed: () -&gt; Unit = {}, onRoomOpenStateChange: (Boolean) -&gt; Unit = {}, onOpenCalendar: () -&gt; Unit = {}, onUnauthorized: () -&gt; Unit = {}, )</ID>
-    <ID>LongMethod:TalkScreen.kt$@Composable private fun ChatContent( session: AuthSession, state: TalkUiState, draft: String, onDraftChange: (String) -&gt; Unit, onSend: () -&gt; Unit, onAttach: () -&gt; Unit, onVoiceToggle: () -&gt; Unit, voiceRecording: Boolean, onRetry: () -&gt; Unit, onStartCall: () -&gt; Unit, onBackClick: () -&gt; Unit, onOpenRoomInfo: () -&gt; Unit, onScheduleMeeting: () -&gt; Unit, onToggleSystemMessages: () -&gt; Unit, onReply: (TalkMessage) -&gt; Unit, onReaction: (TalkMessage, String) -&gt; Unit, onDeleteMessage: (TalkMessage) -&gt; Unit, onEditMessage: (TalkMessage, String) -&gt; Unit, onForwardNoteToSelf: (TalkMessage) -&gt; Unit, onMentionQuery: (String?) -&gt; Unit, onMentionSelected: (TalkMention) -&gt; Unit, onClearReply: () -&gt; Unit, onClearHighlight: () -&gt; Unit, )</ID>
+    <ID>LongMethod:TalkScreen.kt$@Composable private fun ChatContent( session: AuthSession, state: TalkUiState, draft: String, onDraftChange: (String) -&gt; Unit, onSend: () -&gt; Unit, onAttach: () -&gt; Unit, onVoiceToggle: () -&gt; Unit, voiceRecording: Boolean, onRetry: () -&gt; Unit, onStartCall: () -&gt; Unit, onBackClick: () -&gt; Unit, onOpenRoomInfo: () -&gt; Unit, onScheduleMeeting: () -&gt; Unit, onToggleSystemMessages: () -&gt; Unit, onReply: (TalkMessage) -&gt; Unit, onReaction: (TalkMessage, String) -&gt; Unit, onDeleteMessage: (TalkMessage) -&gt; Unit, onEditMessage: (TalkMessage, String) -&gt; Unit, onForwardNoteToSelf: (TalkMessage) -&gt; Unit, onSetReminder: (TalkMessage, ReminderPreset) -&gt; Unit, onMentionQuery: (String?) -&gt; Unit, onMentionSelected: (TalkMention) -&gt; Unit, onClearReply: () -&gt; Unit, onClearHighlight: () -&gt; Unit, )</ID>
    <ID>LoopWithTooManyJumpStatements:TalkRepository.kt$TalkRepository$for</ID>
    <ID>LoopWithTooManyJumpStatements:TalkViewModel.kt$TalkViewModel$while</ID>
    <ID>MatchingDeclarationName:TalkFilters.kt$TalkRoomFilter</ID>
@@ -807,6 +807,7 @@ fun TalkMessageActionSheet(
    onCopy: (TalkMessage) -> Unit,
    onCopyLink: (TalkMessage) -> Unit,
    onForwardNoteToSelf: (TalkMessage) -> Unit,
+    onSetReminder: (TalkMessage, ReminderPreset) -> Unit,
 ) {
    if (message == null) return
    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
@@ -841,6 +842,21 @@ fun TalkMessageActionSheet(
                    text = "Переслать в «Личные заметки»",
                    onClick = { onForwardNoteToSelf(message) },
                )
+                Text(
+                    "Напоминание:",
+                    style = MaterialTheme.typography.labelMedium,
+                    color = F7Colors.TextSecondary,
+                )
+                Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                    listOf(
+                        "Сегодня" to ReminderPreset.TODAY,
+                        "Завтра" to ReminderPreset.TOMORROW,
+                        "Выходные" to ReminderPreset.WEEKEND,
+                        "Неделя" to ReminderPreset.NEXT_WEEK,
+                    ).forEach { (label, preset) ->
+                        F7TextButton(text = label, onClick = { onSetReminder(message, preset) })
+                    }
+                }
            }
            if (canModify) {
                F7TextButton(text = "Изменить", onClick = { onEdit(message) })
@@ -321,6 +321,24 @@ class TalkRepository {
        }
    }

+    /** Напоминание на сообщение (timestamp в секундах). OCS v1. */
+    suspend fun setReminder(session: AuthSession, roomToken: String, messageId: Long, timestamp: Long) {
+        val client = authedClient(session)
+        val url = spreedApi(session, "v1") + "/chat/$roomToken/$messageId/reminder?format=json"
+        val body = FormBody.Builder().add("timestamp", timestamp.toString()).build()
+        val request = Request.Builder()
+            .url(url)
+            .header("OCS-APIRequest", "true")
+            .header("Accept", "application/json")
+            .post(body)
+            .build()
+        client.newCall(request).execute().use { response ->
+            if (response.code != 201 && !response.isSuccessful) {
+                error("Talk reminder failed: HTTP ${response.code}")
+            }
+        }
+    }
+
    private fun authedClient(session: AuthSession): OkHttpClient =
        NetworkFactory.newAuthedClient(session.username, session.appPassword, session.trustAllCerts)

@@ -296,6 +296,7 @@ fun TalkScreen(
                onDeleteMessage = { vm.deleteMessage(session, it.id) },
                onEditMessage = { msg, text -> vm.editMessage(session, msg.id, text) },
                onForwardNoteToSelf = { vm.forwardToNoteToSelf(session, it) },
+                onSetReminder = { msg, preset -> vm.setMessageReminder(session, msg.id, preset) },
                onMentionQuery = { vm.setMentionQuery(session, it) },
                onMentionSelected = { mention ->
                    draft = insertMentionIntoDraft(draft, mention)
@@ -435,6 +436,7 @@ private fun ChatContent(
    onDeleteMessage: (TalkMessage) -> Unit,
    onEditMessage: (TalkMessage, String) -> Unit,
    onForwardNoteToSelf: (TalkMessage) -> Unit,
+    onSetReminder: (TalkMessage, ReminderPreset) -> Unit,
    onMentionQuery: (String?) -> Unit,
    onMentionSelected: (TalkMention) -> Unit,
    onClearReply: () -> Unit,
@@ -532,6 +534,11 @@ private fun ChatContent(
            Toast.makeText(context, "Переслано в «Личные заметки»", Toast.LENGTH_SHORT).show()
            actionMessage = null
        },
+        onSetReminder = { msg, preset ->
+            onSetReminder(msg, preset)
+            Toast.makeText(context, "Напоминание установлено", Toast.LENGTH_SHORT).show()
+            actionMessage = null
+        },
    )

    editingMessage?.let { message ->
@@ -13,6 +13,15 @@ import kotlinx.coroutines.isActive
 import ru.forbion.f7cloud.core.auth.AuthSession
 import ru.forbion.f7cloud.core.designsystem.AppForegroundTracker
 import ru.forbion.f7cloud.core.network.UnauthorizedException
+import java.util.Calendar
+
+/** Пресеты напоминания по сообщению (как в веб-Talk). */
+enum class ReminderPreset {
+    TODAY,
+    TOMORROW,
+    WEEKEND,
+    NEXT_WEEK,
+}

 data class TalkUiState(
    val loading: Boolean = false,
@@ -616,6 +625,52 @@ class TalkViewModel(
        }
    }

+    /** Напоминание на сообщение по пресету (сегодня/завтра/выходные/неделя). */
+    fun setMessageReminder(session: AuthSession, messageId: Long, preset: ReminderPreset) {
+        val token = _state.value.selectedRoomToken ?: return
+        val timestamp = reminderTimestamp(preset)
+        viewModelScope.launch(Dispatchers.IO) {
+            runCatching { repository.setReminder(session, token, messageId, timestamp) }
+                .onFailure { t ->
+                    _state.value = _state.value.copy(
+                        error = t.message ?: "Не удалось поставить напоминание",
+                        unauthorized = t is UnauthorizedException,
+                    )
+                }
+        }
+    }
+
+    private fun reminderTimestamp(preset: ReminderPreset): Long {
+        val cal = Calendar.getInstance()
+        when (preset) {
+            ReminderPreset.TODAY -> cal.setTime(REMINDER_HOUR_EVENING)
+            ReminderPreset.TOMORROW -> {
+                cal.add(Calendar.DAY_OF_YEAR, 1)
+                cal.setTime(REMINDER_HOUR_MORNING)
+            }
+            ReminderPreset.WEEKEND -> {
+                while (cal.get(Calendar.DAY_OF_WEEK) != Calendar.SATURDAY) {
+                    cal.add(Calendar.DAY_OF_YEAR, 1)
+                }
+                cal.setTime(REMINDER_HOUR_MORNING)
+            }
+            ReminderPreset.NEXT_WEEK -> {
+                do {
+                    cal.add(Calendar.DAY_OF_YEAR, 1)
+                } while (cal.get(Calendar.DAY_OF_WEEK) != Calendar.MONDAY)
+                cal.setTime(REMINDER_HOUR_MORNING)
+            }
+        }
+        return cal.timeInMillis / MILLIS_IN_SECOND
+    }
+
+    private fun Calendar.setTime(hour: Int) {
+        set(Calendar.HOUR_OF_DAY, hour)
+        set(Calendar.MINUTE, 0)
+        set(Calendar.SECOND, 0)
+        set(Calendar.MILLISECOND, 0)
+    }
+
    fun deleteMessage(session: AuthSession, messageId: Long) {
        val token = _state.value.selectedRoomToken ?: return
        viewModelScope.launch(Dispatchers.IO) {
@@ -774,5 +829,9 @@ class TalkViewModel(

        /** spreed conversation type: note-to-self (Личные заметки). */
        private const val ROOM_TYPE_NOTE_TO_SELF = 6
+
+        private const val MILLIS_IN_SECOND = 1000L
+        private const val REMINDER_HOUR_EVENING = 18
+        private const val REMINDER_HOUR_MORNING = 8
    }
 }