From 9c2dc1e6a5b328c76468bbfb9994598ba5c5698c Mon Sep 17 00:00:00 2001 From: Ren Amamiya Date: Mon, 29 Jun 2026 13:16:08 +0700 Subject: [PATCH] move some files to nostr folder --- .../kotlin/su/reya/coop/AndroidExternalSigner.kt | 2 ++ .../kotlin/su/reya/coop/NostrForegroundService.kt | 1 + .../androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt | 8 ++++---- .../androidMain/kotlin/su/reya/coop/screens/HomeScreen.kt | 6 +++--- .../kotlin/su/reya/coop/screens/RequestListScreen.kt | 2 +- .../androidMain/kotlin/su/reya/coop/shared/RoomHelper.kt | 2 +- .../src/commonMain/kotlin/su/reya/coop/NostrViewModel.kt | 5 +++++ .../su/reya/coop/{ => nostr}/ExternalSignerHandler.kt | 2 +- .../su/reya/coop/{ => nostr}/ExternalSignerProxy.kt | 2 +- .../src/commonMain/kotlin/su/reya/coop/nostr/Messaging.kt | 4 ---- shared/src/commonMain/kotlin/su/reya/coop/nostr/Nostr.kt | 1 - .../kotlin/su/reya/coop/nostr/ProfileManager.kt | 1 - .../commonMain/kotlin/su/reya/coop/nostr/RelayManager.kt | 1 - .../commonMain/kotlin/su/reya/coop/{ => nostr}/Room.kt | 2 +- .../commonMain/kotlin/su/reya/coop/{ => nostr}/Signer.kt | 2 +- 15 files changed, 21 insertions(+), 20 deletions(-) rename shared/src/commonMain/kotlin/su/reya/coop/{ => nostr}/ExternalSignerHandler.kt (98%) rename shared/src/commonMain/kotlin/su/reya/coop/{ => nostr}/ExternalSignerProxy.kt (98%) rename shared/src/commonMain/kotlin/su/reya/coop/{ => nostr}/Room.kt (99%) rename shared/src/commonMain/kotlin/su/reya/coop/{ => nostr}/Signer.kt (98%) diff --git a/composeApp/src/androidMain/kotlin/su/reya/coop/AndroidExternalSigner.kt b/composeApp/src/androidMain/kotlin/su/reya/coop/AndroidExternalSigner.kt index 3f367fe..136aa47 100644 --- a/composeApp/src/androidMain/kotlin/su/reya/coop/AndroidExternalSigner.kt +++ b/composeApp/src/androidMain/kotlin/su/reya/coop/AndroidExternalSigner.kt @@ -6,6 +6,8 @@ import android.content.Intent import androidx.core.net.toUri import rust.nostr.sdk.PublicKey import rust.nostr.sdk.UnsignedEvent +import su.reya.coop.nostr.ExternalSignerHandler +import su.reya.coop.nostr.ExternalSignerResult class AndroidExternalSigner( private val context: Context, diff --git a/composeApp/src/androidMain/kotlin/su/reya/coop/NostrForegroundService.kt b/composeApp/src/androidMain/kotlin/su/reya/coop/NostrForegroundService.kt index 76ebe5b..a604a0e 100644 --- a/composeApp/src/androidMain/kotlin/su/reya/coop/NostrForegroundService.kt +++ b/composeApp/src/androidMain/kotlin/su/reya/coop/NostrForegroundService.kt @@ -21,6 +21,7 @@ import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancel import kotlinx.coroutines.launch import su.reya.coop.nostr.NostrManager +import su.reya.coop.nostr.roomId import java.io.File private const val GROUP_KEY_MESSAGES = "su.reya.coop.MESSAGES" diff --git a/composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt b/composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt index 27d308e..6d42015 100644 --- a/composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt +++ b/composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt @@ -68,11 +68,11 @@ import rust.nostr.sdk.UnsignedEvent import su.reya.coop.LocalNavigator import su.reya.coop.LocalNostrViewModel import su.reya.coop.LocalSnackbarHostState -import su.reya.coop.Room import su.reya.coop.Screen -import su.reya.coop.formatAsGroupHeader -import su.reya.coop.humanReadable -import su.reya.coop.roomId +import su.reya.coop.nostr.Room +import su.reya.coop.nostr.formatAsGroupHeader +import su.reya.coop.nostr.humanReadable +import su.reya.coop.nostr.roomId import su.reya.coop.shared.Avatar import su.reya.coop.shared.getExpressiveFontFamily import su.reya.coop.shared.nameFlow diff --git a/composeApp/src/androidMain/kotlin/su/reya/coop/screens/HomeScreen.kt b/composeApp/src/androidMain/kotlin/su/reya/coop/screens/HomeScreen.kt index b18e45f..ce20113 100644 --- a/composeApp/src/androidMain/kotlin/su/reya/coop/screens/HomeScreen.kt +++ b/composeApp/src/androidMain/kotlin/su/reya/coop/screens/HomeScreen.kt @@ -95,10 +95,10 @@ import su.reya.coop.LocalNavigator import su.reya.coop.LocalNostrViewModel import su.reya.coop.LocalScanResult import su.reya.coop.LocalSnackbarHostState -import su.reya.coop.Room -import su.reya.coop.RoomKind import su.reya.coop.Screen -import su.reya.coop.ago +import su.reya.coop.nostr.Room +import su.reya.coop.nostr.RoomKind +import su.reya.coop.nostr.ago import su.reya.coop.shared.Avatar import su.reya.coop.shared.getExpressiveFontFamily import su.reya.coop.shared.nameFlow diff --git a/composeApp/src/androidMain/kotlin/su/reya/coop/screens/RequestListScreen.kt b/composeApp/src/androidMain/kotlin/su/reya/coop/screens/RequestListScreen.kt index 3e2a67c..a902365 100644 --- a/composeApp/src/androidMain/kotlin/su/reya/coop/screens/RequestListScreen.kt +++ b/composeApp/src/androidMain/kotlin/su/reya/coop/screens/RequestListScreen.kt @@ -40,8 +40,8 @@ import kotlinx.coroutines.launch import su.reya.coop.LocalNavigator import su.reya.coop.LocalNostrViewModel import su.reya.coop.LocalSnackbarHostState -import su.reya.coop.RoomKind import su.reya.coop.Screen +import su.reya.coop.nostr.RoomKind @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @Composable diff --git a/composeApp/src/androidMain/kotlin/su/reya/coop/shared/RoomHelper.kt b/composeApp/src/androidMain/kotlin/su/reya/coop/shared/RoomHelper.kt index bbb861a..8fdbff4 100644 --- a/composeApp/src/androidMain/kotlin/su/reya/coop/shared/RoomHelper.kt +++ b/composeApp/src/androidMain/kotlin/su/reya/coop/shared/RoomHelper.kt @@ -5,7 +5,7 @@ import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map import su.reya.coop.NostrViewModel -import su.reya.coop.Room +import su.reya.coop.nostr.Room import su.reya.coop.short fun Room.nameFlow(viewModel: NostrViewModel): Flow { diff --git a/shared/src/commonMain/kotlin/su/reya/coop/NostrViewModel.kt b/shared/src/commonMain/kotlin/su/reya/coop/NostrViewModel.kt index 0452ce6..632f713 100644 --- a/shared/src/commonMain/kotlin/su/reya/coop/NostrViewModel.kt +++ b/shared/src/commonMain/kotlin/su/reya/coop/NostrViewModel.kt @@ -41,7 +41,12 @@ import rust.nostr.sdk.Tag import rust.nostr.sdk.Timestamp import rust.nostr.sdk.UnsignedEvent import su.reya.coop.blossom.BlossomClient +import su.reya.coop.nostr.ExternalSignerHandler +import su.reya.coop.nostr.ExternalSignerProxy import su.reya.coop.nostr.Nostr +import su.reya.coop.nostr.Room +import su.reya.coop.nostr.SignerPermissions +import su.reya.coop.nostr.roomId import su.reya.coop.storage.SecretStorage import kotlin.time.Clock import kotlin.time.Duration.Companion.milliseconds diff --git a/shared/src/commonMain/kotlin/su/reya/coop/ExternalSignerHandler.kt b/shared/src/commonMain/kotlin/su/reya/coop/nostr/ExternalSignerHandler.kt similarity index 98% rename from shared/src/commonMain/kotlin/su/reya/coop/ExternalSignerHandler.kt rename to shared/src/commonMain/kotlin/su/reya/coop/nostr/ExternalSignerHandler.kt index 920fe64..9f5ba98 100644 --- a/shared/src/commonMain/kotlin/su/reya/coop/ExternalSignerHandler.kt +++ b/shared/src/commonMain/kotlin/su/reya/coop/nostr/ExternalSignerHandler.kt @@ -1,4 +1,4 @@ -package su.reya.coop +package su.reya.coop.nostr import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json diff --git a/shared/src/commonMain/kotlin/su/reya/coop/ExternalSignerProxy.kt b/shared/src/commonMain/kotlin/su/reya/coop/nostr/ExternalSignerProxy.kt similarity index 98% rename from shared/src/commonMain/kotlin/su/reya/coop/ExternalSignerProxy.kt rename to shared/src/commonMain/kotlin/su/reya/coop/nostr/ExternalSignerProxy.kt index deee922..53dce6d 100644 --- a/shared/src/commonMain/kotlin/su/reya/coop/ExternalSignerProxy.kt +++ b/shared/src/commonMain/kotlin/su/reya/coop/nostr/ExternalSignerProxy.kt @@ -1,4 +1,4 @@ -package su.reya.coop +package su.reya.coop.nostr import rust.nostr.sdk.AsyncNostrSigner import rust.nostr.sdk.Event diff --git a/shared/src/commonMain/kotlin/su/reya/coop/nostr/Messaging.kt b/shared/src/commonMain/kotlin/su/reya/coop/nostr/Messaging.kt index f4a089f..157f200 100644 --- a/shared/src/commonMain/kotlin/su/reya/coop/nostr/Messaging.kt +++ b/shared/src/commonMain/kotlin/su/reya/coop/nostr/Messaging.kt @@ -24,10 +24,6 @@ import rust.nostr.sdk.Tag import rust.nostr.sdk.UnsignedEvent import rust.nostr.sdk.nip17ExtractRelayList import rust.nostr.sdk.nip59MakeGiftWrapAsync -import su.reya.coop.Room -import su.reya.coop.RoomKind -import su.reya.coop.UniversalSigner -import su.reya.coop.roomId import kotlin.time.Duration data class MessageSyncState( diff --git a/shared/src/commonMain/kotlin/su/reya/coop/nostr/Nostr.kt b/shared/src/commonMain/kotlin/su/reya/coop/nostr/Nostr.kt index 705d287..b873b7a 100644 --- a/shared/src/commonMain/kotlin/su/reya/coop/nostr/Nostr.kt +++ b/shared/src/commonMain/kotlin/su/reya/coop/nostr/Nostr.kt @@ -29,7 +29,6 @@ import rust.nostr.sdk.SleepWhenIdle import rust.nostr.sdk.Timestamp import rust.nostr.sdk.UnsignedEvent import rust.nostr.sdk.initLogger -import su.reya.coop.UniversalSigner import kotlin.time.Duration object NostrManager { diff --git a/shared/src/commonMain/kotlin/su/reya/coop/nostr/ProfileManager.kt b/shared/src/commonMain/kotlin/su/reya/coop/nostr/ProfileManager.kt index a1cf522..a326965 100644 --- a/shared/src/commonMain/kotlin/su/reya/coop/nostr/ProfileManager.kt +++ b/shared/src/commonMain/kotlin/su/reya/coop/nostr/ProfileManager.kt @@ -26,7 +26,6 @@ import rust.nostr.sdk.ReqTarget import rust.nostr.sdk.SendEventTarget import rust.nostr.sdk.SubscribeAutoCloseOptions import rust.nostr.sdk.Timestamp -import su.reya.coop.UniversalSigner import kotlin.time.Duration class ProfileManager(private val nostr: Nostr) { diff --git a/shared/src/commonMain/kotlin/su/reya/coop/nostr/RelayManager.kt b/shared/src/commonMain/kotlin/su/reya/coop/nostr/RelayManager.kt index bc9330f..7c5569d 100644 --- a/shared/src/commonMain/kotlin/su/reya/coop/nostr/RelayManager.kt +++ b/shared/src/commonMain/kotlin/su/reya/coop/nostr/RelayManager.kt @@ -17,7 +17,6 @@ import rust.nostr.sdk.SendEventTarget import rust.nostr.sdk.SubscribeAutoCloseOptions import rust.nostr.sdk.extractRelayList import rust.nostr.sdk.nip17ExtractRelayList -import su.reya.coop.UniversalSigner import kotlin.time.Duration class RelayManager(private val nostr: Nostr) { diff --git a/shared/src/commonMain/kotlin/su/reya/coop/Room.kt b/shared/src/commonMain/kotlin/su/reya/coop/nostr/Room.kt similarity index 99% rename from shared/src/commonMain/kotlin/su/reya/coop/Room.kt rename to shared/src/commonMain/kotlin/su/reya/coop/nostr/Room.kt index 816e0a6..eed2744 100644 --- a/shared/src/commonMain/kotlin/su/reya/coop/Room.kt +++ b/shared/src/commonMain/kotlin/su/reya/coop/nostr/Room.kt @@ -1,4 +1,4 @@ -package su.reya.coop +package su.reya.coop.nostr import kotlinx.datetime.DateTimeUnit import kotlinx.datetime.TimeZone diff --git a/shared/src/commonMain/kotlin/su/reya/coop/Signer.kt b/shared/src/commonMain/kotlin/su/reya/coop/nostr/Signer.kt similarity index 98% rename from shared/src/commonMain/kotlin/su/reya/coop/Signer.kt rename to shared/src/commonMain/kotlin/su/reya/coop/nostr/Signer.kt index dc98991..65fa513 100644 --- a/shared/src/commonMain/kotlin/su/reya/coop/Signer.kt +++ b/shared/src/commonMain/kotlin/su/reya/coop/nostr/Signer.kt @@ -1,4 +1,4 @@ -package su.reya.coop +package su.reya.coop.nostr import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock