ktlint

pubnub · Jul 31, 2024 · 71c497e · 71c497e
1 parent fa890ef
commit 71c497e
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 20 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,4 @@
 import com.pubnub.gradle.tasks.GenerateVersionTask
-import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
-import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
-import org.jetbrains.kotlin.gradle.targets.js.yarn.yarn
 
 plugins {
     kotlin("multiplatform") version "2.0.0"

diff --git a/pubnub-chat-api/build.gradle.kts b/pubnub-chat-api/build.gradle.kts
@@ -1,6 +1,3 @@
-import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
-import org.jetbrains.kotlin.gradle.targets.js.yarn.yarn
-
 plugins {
     kotlin("multiplatform") version "2.0.0"
     kotlin("plugin.serialization") version "2.0.0"

diff --git a/pubnub-chat-api/src/commonMain/kotlin/com/pubnub/chat/types/Types.kt b/pubnub-chat-api/src/commonMain/kotlin/com/pubnub/chat/types/Types.kt
@@ -63,11 +63,19 @@ sealed class EventContent {
         val files: List<File>? = null,
     ) : EventContent() {
         override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (other !is TextMessageContent) return false
-
-            if (text != other.text) return false
-            if (files != other.files) return false
+            if (this === other) {
+                return true
+            }
+            if (other !is TextMessageContent) {
+                return false
+            }
+
+            if (text != other.text) {
+                return false
+            }
+            if (files != other.files) {
+                return false
+            }
 
             return true
         }

diff --git a/pubnub-chat-impl/build.gradle.kts b/pubnub-chat-impl/build.gradle.kts
@@ -1,7 +1,3 @@
-import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
-import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
-import org.jetbrains.kotlin.gradle.targets.js.yarn.yarn
-
 plugins {
     kotlin("multiplatform") version "2.0.0"
     kotlin("plugin.serialization") version "2.0.0"

diff --git a/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/ChatImpl.kt b/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/ChatImpl.kt
@@ -574,7 +574,9 @@ class ChatImpl(
         callback: (event: Event<T>) -> Unit
     ): AutoCloseable {
         val handler = fun(_: PubNub, pnEvent: PNEvent) {
-            if (pnEvent.channel != channelId) return
+            if (pnEvent.channel != channelId) {
+                return
+            }
             val message = (pnEvent as? MessageResult)?.message ?: return
             val eventContent: EventContent = PNDataEncoder.decode<EventContent>(message)
 
@@ -593,8 +595,16 @@ class ChatImpl(
         val method = type.getEmitMethod() ?: customMethod
         val listener = createEventListener(
             pubNub,
-            onMessage = if (method == EmitEventMethod.PUBLISH) handler else { _, _ -> },
-            onSignal = if (method == EmitEventMethod.SIGNAL) handler else { _, _ -> },
+            onMessage = if (method == EmitEventMethod.PUBLISH) {
+                handler
+            } else {
+                { _, _ -> }
+            },
+            onSignal = if (method == EmitEventMethod.SIGNAL) {
+                handler
+            } else {
+                { _, _ -> }
+            },
         )
         val channelEntity = pubNub.channel(channelId)
         val subscription = channelEntity.subscription()
@@ -637,7 +647,11 @@ class ChatImpl(
                             channelId = userId,
                             payload = EventContent.Moderation(
                                 channelId = channel,
-                                restriction = if (restriction.ban) RestrictionType.BAN else RestrictionType.MUTE,
+                                restriction = if (restriction.ban) {
+                                    RestrictionType.BAN
+                                } else {
+                                    RestrictionType.MUTE
+                                },
                                 reason = restriction.reason
                             ),
                         )

diff --git a/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/message/BaseMessage.kt b/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/message/BaseMessage.kt
@@ -236,7 +236,9 @@ abstract class BaseMessage<T : Message>(
             val listener = createEventListener(chat.pubNub, onMessageAction = { _, event ->
                 val message =
                     latestMessages.find { it.timetoken == event.messageAction.messageTimetoken } ?: return@createEventListener
-                if (message.channelId != event.channel) return@createEventListener
+                if (message.channelId != event.channel) {
+                    return@createEventListener
+                }
                 val actions = if (event.event == "added") {
                     assignAction(
                         message.actions,