Format code

hypergonial · hypergonial · commit 04d3900abb68 · 2025-04-21T12:55:33.000+02:00
diff --git a/composeApp/src/androidMain/kotlin/com/hypergonial/chat/MainActivity.kt b/composeApp/src/androidMain/kotlin/com/hypergonial/chat/MainActivity.kt
@@ -42,9 +42,7 @@ class MainActivity : ComponentActivity() {
                     showPushNotification = false,
                 )
         )
-        NotifierManager.setLogger {
-            Logger.withTag("NotifierManager").i(it)
-        }
+        NotifierManager.setLogger { Logger.withTag("NotifierManager").i(it) }
 
         val permissionUtil by permissionUtil()
         permissionUtil.askNotificationPermission()
diff --git a/composeApp/src/androidMain/kotlin/com/hypergonial/chat/MessagingService.kt b/composeApp/src/androidMain/kotlin/com/hypergonial/chat/MessagingService.kt
@@ -33,9 +33,7 @@ class MessagingService : FirebaseMessagingService() {
                     showPushNotification = false,
                 )
         )
-        NotifierManager.setLogger {
-            Logger.withTag("NotifierManager").i(it)
-        }
+        NotifierManager.setLogger { Logger.withTag("NotifierManager").i(it) }
 
         if (message.data["type"] == "notification") {
             notificationProvider.sendNotification {
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/model/Client.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/model/Client.kt
@@ -133,12 +133,13 @@ interface Client : InstanceKeeper.Instance, EventManagerAware, CacheAware {
      */
     suspend fun updateSelf(scope: (UserUpdateRequest.Builder.() -> Unit)): User
 
-    /** Update the Firebase Cloud Messaging token for the currently authenticated user
+    /**
+     * Update the Firebase Cloud Messaging token for the currently authenticated user
      *
      * @param fcmToken The new FCM token
-     * @param previousToken The previous FCM token, if any
-     *  This will be used to remove the previous token from the user's account
-     * */
+     * @param previousToken The previous FCM token, if any This will be used to remove the previous token from the
+     *   user's account
+     */
     suspend fun updateFcmToken(fcmToken: String, previousToken: String? = null)
 
     /**
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/model/FCMSettings.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/model/FCMSettings.kt
@@ -3,8 +3,4 @@ package com.hypergonial.chat.model
 import kotlinx.datetime.Instant
 import kotlinx.serialization.Serializable
 
-@Serializable
-data class FCMSettings(
-    val token: String,
-    val lastUpdated: Instant,
-)
+@Serializable data class FCMSettings(val token: String, val lastUpdated: Instant)
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/model/payloads/fcm/PushNotificationData.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/model/payloads/fcm/PushNotificationData.kt
@@ -4,15 +4,10 @@ import com.hypergonial.chat.model.payloads.Snowflake
 import com.hypergonial.chat.model.payloads.toSnowflake
 import com.mmk.kmpnotifier.notification.PayloadData
 
-data class PushNotificationData(
-    val channelId: Snowflake,
-    val guildId: Snowflake,
-) {
+data class PushNotificationData(val channelId: Snowflake, val guildId: Snowflake) {
     companion object {
         fun fromPayload(payload: PayloadData): PushNotificationData {
-            require(payload["type"]?.toString() == "notification") {
-                "Invalid notification type"
-            }
+            require(payload["type"]?.toString() == "notification") { "Invalid notification type" }
 
             return PushNotificationData(
                 channelId = (payload["channel_id"] as String).toSnowflake(),
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/EditorFocusInhibitor.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/EditorFocusInhibitor.kt
@@ -9,8 +9,8 @@ import kotlinx.coroutines.CompletableDeferred
  * This interface is responsible for registering and releasing the inhibition of editor auto-focus behaviour via global
  * key events.
  *
- * If the user presses a key and no other component is currently using the editor, the main editor will automatically gain
- * focus.
+ * If the user presses a key and no other component is currently using the editor, the main editor will automatically
+ * gain focus.
  *
  * This interface allows components to inhibit this behaviour by acquiring and releasing focus for a given key.
  *
@@ -44,15 +44,17 @@ object NoOpEditorFocusInhibitor : EditorFocusInhibitor {
 
 sealed class InhibitorMessage {
     data class Acquire(val key: String) : InhibitorMessage()
+
     data class Release(val key: String) : InhibitorMessage()
+
     data class Query(val response: CompletableDeferred<Boolean>) : InhibitorMessage()
 }
 
 class EditorFocusInhibitorActor : Actor<InhibitorMessage>() {
     private val focusStates = hashSetOf<String>()
 
     override fun onMessage(message: InhibitorMessage) {
-        when(message) {
+        when (message) {
             is InhibitorMessage.Acquire -> acquire(message.key)
             is InhibitorMessage.Release -> release(message.key)
             is InhibitorMessage.Query -> message.response.complete(isFree())
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/Notifications.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/Notifications.kt
@@ -9,12 +9,12 @@ import kotlin.random.Random
 
 interface NotificationProvider {
     fun sendNotification(builder: NotificationBuilder.() -> Unit)
+
     fun dismissNotification(channelId: Snowflake, id: Int)
+
     fun dismissAllForChannel(channelId: Snowflake) {
         val ids = settings.getNotificationsIn(channelId)
-        ids?.forEach { id ->
-            dismissNotification(channelId, id)
-        }
+        ids?.forEach { id -> dismissNotification(channelId, id) }
     }
 }
 
@@ -29,9 +29,7 @@ class NotificationBuilder {
     var image: NotificationImage? = null
 
     companion object {
-        fun toKMPNotify(
-            builder: NotificationBuilder
-        ): NotifierBuilder.() -> Unit {
+        fun toKMPNotify(builder: NotificationBuilder): NotifierBuilder.() -> Unit {
             return {
                 this.id = builder.id
                 this.title = builder.title
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/components/ChannelComponent.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/components/ChannelComponent.kt
@@ -18,8 +18,8 @@ import com.hypergonial.chat.appendMessages
 import com.hypergonial.chat.containAsEffect
 import com.hypergonial.chat.genNonce
 import com.hypergonial.chat.model.Client
-import com.hypergonial.chat.model.DelicateCacheApi
 import com.hypergonial.chat.model.ClientResumedEvent
+import com.hypergonial.chat.model.DelicateCacheApi
 import com.hypergonial.chat.model.LifecycleResumedEvent
 import com.hypergonial.chat.model.MessageCreateEvent
 import com.hypergonial.chat.model.MessageRemoveEvent
@@ -747,27 +747,29 @@ class DefaultChannelComponent(
                 val index = data.value.messageEntries.indexOf(entry)
 
                 // Try the top first, then bottom, or create new entry if needed
-                val nextEntry = data.value.messageEntries.getOrNull(index + 1)
-                    ?: data.value.messageEntries.getOrNull(index - 1)
-                    ?: run {
-                        messageEntryComponent(mutableStateListOf()).also { newEntry ->
-                            data.value.messageEntries.add(index, newEntry)
+                val nextEntry =
+                    data.value.messageEntries.getOrNull(index + 1)
+                        ?: data.value.messageEntries.getOrNull(index - 1)
+                        ?: run {
+                            messageEntryComponent(mutableStateListOf()).also { newEntry ->
+                                data.value.messageEntries.add(index, newEntry)
+                            }
                         }
-                    }
 
                 nextEntry.setTopEndIndicator(entry.data.value.topEndIndicator)
             }
             if (entry.data.value.bottomEndIndicator != null) {
                 val index = data.value.messageEntries.indexOf(entry)
 
                 // Try the bottom first, then top, or create new entry if needed
-                val nextEntry = data.value.messageEntries.getOrNull(index - 1)
-                    ?: data.value.messageEntries.getOrNull(index + 1)
-                    ?: run {
-                        messageEntryComponent(mutableStateListOf()).also { newEntry ->
-                            data.value.messageEntries.add(index, newEntry)
+                val nextEntry =
+                    data.value.messageEntries.getOrNull(index - 1)
+                        ?: data.value.messageEntries.getOrNull(index + 1)
+                        ?: run {
+                            messageEntryComponent(mutableStateListOf()).also { newEntry ->
+                                data.value.messageEntries.add(index, newEntry)
+                            }
                         }
-                    }
 
                 nextEntry.setBottomEndIndicator(entry.data.value.bottomEndIndicator)
             }
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/components/GuildSettingsComponent.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/components/GuildSettingsComponent.kt
@@ -9,9 +9,9 @@ import com.arkivanov.essenty.lifecycle.coroutines.coroutineScope
 import com.hypergonial.chat.EffectContainer
 import com.hypergonial.chat.containAsEffect
 import com.hypergonial.chat.model.Client
+import com.hypergonial.chat.model.ClientPausedEvent
 import com.hypergonial.chat.model.GuildRemoveEvent
 import com.hypergonial.chat.model.GuildUpdateEvent
-import com.hypergonial.chat.model.ClientPausedEvent
 import com.hypergonial.chat.model.exceptions.ClientException
 import com.hypergonial.chat.model.payloads.Snowflake
 import com.hypergonial.chat.view.content.GuildSettingsContent
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/components/MainComponent.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/components/MainComponent.kt
@@ -253,7 +253,9 @@ class DefaultMainComponent(
                 is SlotConfig.Channel -> {
                     val selectedChannel = data.value.selectedChannel
                     if (selectedChannel == null) {
-                        logger.w { "Main slot activated with channel config, but no channel is selected. (This is a bug)" }
+                        logger.w {
+                            "Main slot activated with channel config, but no channel is selected. (This is a bug)"
+                        }
                         DefaultFallbackMainComponent(childCtx, ::onChannelCreateClicked)
                     } else {
                         DefaultChannelComponent(
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/components/RootComponent.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/components/RootComponent.kt
@@ -120,21 +120,13 @@ class DefaultRootComponent(val ctx: ComponentContext) : RootComponent, Component
         // If we are already logged in, connect to the gateway
         scope.launch { if (client.isLoggedIn()) client.connect() }
 
-        ctx.lifecycle.doOnResume {
-            client.eventManager.dispatch(LifecycleResumedEvent())
-        }
+        ctx.lifecycle.doOnResume { client.eventManager.dispatch(LifecycleResumedEvent()) }
 
-        ctx.lifecycle.doOnPause {
-            client.eventManager.dispatch(LifecyclePausedEvent())
-        }
+        ctx.lifecycle.doOnPause { client.eventManager.dispatch(LifecyclePausedEvent()) }
 
-        ctx.lifecycle.doOnDestroy {
-            client.eventManager.dispatch(LifecycleDestroyedEvent())
-        }
+        ctx.lifecycle.doOnDestroy { client.eventManager.dispatch(LifecycleDestroyedEvent()) }
 
-        ctx.lifecycle.doOnStop {
-            client.eventManager.dispatch(LifecycleStoppedEvent())
-        }
+        ctx.lifecycle.doOnStop { client.eventManager.dispatch(LifecycleStoppedEvent()) }
 
         if (platform.needsToSuspendClient()) {
             manageClientLifecycle()
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/composables/AdaptiveDrawer.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/composables/AdaptiveDrawer.kt
@@ -18,7 +18,6 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalLayoutDirection
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/composables/Autofill.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/composables/Autofill.kt
@@ -13,29 +13,26 @@ import androidx.compose.ui.platform.LocalAutofillTree
 
 // Taken from https://bryanherbst.com/2021/04/13/compose-autofill/
 
-/** Add autofill support to a composable. This is typically applied to text inputs.
-*
-* @param autofillTypes The types of autofill data that this field can accept.
-* @param onFill A callback that is called when the autofill data is filled into the field.
-*  */
+/**
+ * Add autofill support to a composable. This is typically applied to text inputs.
+ *
+ * @param autofillTypes The types of autofill data that this field can accept.
+ * @param onFill A callback that is called when the autofill data is filled into the field.
+ */
 @OptIn(ExperimentalComposeUiApi::class)
-fun Modifier.autofill(
-    autofillTypes: List<AutofillType>,
-    onFill: ((String) -> Unit),
-) = composed {
+fun Modifier.autofill(autofillTypes: List<AutofillType>, onFill: ((String) -> Unit)) = composed {
     val autofill = LocalAutofill.current
     val autofillNode = AutofillNode(onFill = onFill, autofillTypes = autofillTypes)
     LocalAutofillTree.current += autofillNode
 
-    this.onGloballyPositioned {
-        autofillNode.boundingBox = it.boundsInWindow()
-    }.onFocusChanged { focusState ->
-        autofill?.run {
-            if (focusState.isFocused) {
-                requestAutofillForNode(autofillNode)
-            } else {
-                cancelAutofillForNode(autofillNode)
+    this.onGloballyPositioned { autofillNode.boundingBox = it.boundsInWindow() }
+        .onFocusChanged { focusState ->
+            autofill?.run {
+                if (focusState.isFocused) {
+                    requestAutofillForNode(autofillNode)
+                } else {
+                    cancelAutofillForNode(autofillNode)
+                }
             }
         }
-    }
 }
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/composables/Dialogs.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/composables/Dialogs.kt
@@ -31,7 +31,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import co.touchlab.kermit.Logger
 
 class AnimatedDialogScope(
     private val coroutineScope: CoroutineScope,
@@ -160,9 +159,7 @@ private fun DialogImpl(
                             } else it
                         },
                 ) {
-                    Box(Modifier.clickable(null, null) { /* Ignore clicks on the content */}) {
-                        content(dialogScope)
-                    }
+                    Box(Modifier.clickable(null, null) { /* Ignore clicks on the content */ }) { content(dialogScope) }
                 }
             }
         }
@@ -229,9 +226,7 @@ private fun PopupImpl(
                             } else it
                         },
                 ) {
-                    Box(Modifier.clickable(null, null) { /* Ignore clicks on the content */}) {
-                        content(dialogScope)
-                    }
+                    Box(Modifier.clickable(null, null) { /* Ignore clicks on the content */ }) { content(dialogScope) }
                 }
             }
         }
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/composables/EditorFocusInhibitor.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/composables/EditorFocusInhibitor.kt
@@ -2,10 +2,7 @@ package com.hypergonial.chat.view.composables
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.rememberCoroutineScope
 import com.hypergonial.chat.view.editorFocusInhibitor
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
 
 /**
  * When this composable enters the composition, if enabled, it acquires the editor focus inhibitor with the given [key].
@@ -18,8 +15,6 @@ fun EditorFocusInhibitor(key: String, isEnabled: Boolean = true) {
             editorFocusInhibitor.acquire(key)
         }
 
-        onDispose {
-            editorFocusInhibitor.release(key)
-        }
+        onDispose { editorFocusInhibitor.release(key) }
     }
 }
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/composables/MessageList.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/composables/MessageList.kt
@@ -293,13 +293,14 @@ fun MessageWithoutHeader(component: MessageComponent) {
     }
 }
 
-/** The content of a message in markdown.
+/**
+ * The content of a message in markdown.
  *
  * @param component The message to display the content of.
  * @param modifier The modifier to apply to the content.
  * @param isInteractive Whether the message content should be interactive. If false, the message content will not be
- *  clickable or editable.
- * */
+ *   clickable or editable.
+ */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun MessageContent(component: MessageComponent, modifier: Modifier = Modifier, isInteractive: Boolean = true) {
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/composables/SidebarChannelItem.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/composables/SidebarChannelItem.kt
@@ -11,7 +11,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Tag
 import androidx.compose.material.icons.outlined.Code
 import androidx.compose.material.icons.outlined.Delete
-import androidx.compose.material.icons.outlined.Edit
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
@@ -43,6 +42,7 @@ import com.hypergonial.chat.model.settings
  * @param icon The icon to display for the channel.
  * @param onSelect The callback to call when the channel is selected.
  */
+@Suppress("UnusedParameter")
 @Composable
 fun SidebarChannelItem(
     label: String,
@@ -61,11 +61,15 @@ fun SidebarChannelItem(
         isAltMenuActive,
         onDismissRequest = { isAltMenuActive = false },
         altActions = {
+            /*
             if (onEdit != null) {
+
                 item("TODO - Edit", leadingIcon = { Icon(Icons.Outlined.Edit, contentDescription = "Edit Icon") }) {
                     onEdit()
                 }
+
             }
+            */
 
             if (onDelete != null) {
                 item("Delete", leadingIcon = { Icon(Icons.Outlined.Delete, contentDescription = "Delete Icon") }) {
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/content/ChannelContent.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/content/ChannelContent.kt
@@ -62,7 +62,6 @@ import com.hypergonial.chat.view.composables.DangerConfirmDialog
 import com.hypergonial.chat.view.composables.FileDropTarget
 import com.hypergonial.chat.view.composables.MessageList
 import com.hypergonial.chat.view.composables.MessagePreview
-import com.hypergonial.chat.view.composables.MessageWithHeader
 import com.hypergonial.chat.view.composables.TypingIndicator
 import kotlinx.coroutines.launch
 
diff --git a/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/content/MainContent.kt b/composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/content/MainContent.kt
diff --git a/composeApp/src/desktopMain/kotlin/com/hypergonial/chat/main.kt b/composeApp/src/desktopMain/kotlin/com/hypergonial/chat/main.kt
diff --git a/composeApp/src/desktopMain/kotlin/com/hypergonial/chat/view/Notifications.desktop.kt b/composeApp/src/desktopMain/kotlin/com/hypergonial/chat/view/Notifications.desktop.kt
diff --git a/composeApp/src/iosMain/kotlin/com/hypergonial/chat/MainViewController.kt b/composeApp/src/iosMain/kotlin/com/hypergonial/chat/MainViewController.kt
diff --git a/composeApp/src/wasmJsMain/kotlin/com/hypergonial/chat/view/EditorFocusInhibitor.wasmJs.kt b/composeApp/src/wasmJsMain/kotlin/com/hypergonial/chat/view/EditorFocusInhibitor.wasmJs.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,7 @@ class MainActivity : ComponentActivity() {`
`42`	`42`	`showPushNotification = false,`
`43`	`43`	`)`
`44`	`44`	`)`
`45`		`- NotifierManager.setLogger {`
`46`		`- Logger.withTag("NotifierManager").i(it)`
`47`		`- }`
	`45`	`+ NotifierManager.setLogger { Logger.withTag("NotifierManager").i(it) }`
`48`	`46`
`49`	`47`	`val permissionUtil by permissionUtil()`
`50`	`48`	`permissionUtil.askNotificationPermission()`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,7 @@ class MessagingService : FirebaseMessagingService() {`
`33`	`33`	`showPushNotification = false,`
`34`	`34`	`)`
`35`	`35`	`)`
`36`		`- NotifierManager.setLogger {`
`37`		`- Logger.withTag("NotifierManager").i(it)`
`38`		`- }`
	`36`	`+ NotifierManager.setLogger { Logger.withTag("NotifierManager").i(it) }`
`39`	`37`
`40`	`38`	`if (message.data["type"] == "notification") {`
`41`	`39`	`notificationProvider.sendNotification {`