fix merge

2023-08-14 10:51:14 -03:00
parent 012fdc8cc6
commit d2eea9f0ae
1 changed files with 103 additions and 95 deletions
@@ -158,6 +158,7 @@ open class NewPostViewModel() : ViewModel() {
    }

    fun sendPost(relayList: List<Relay>? = null, signEvent: Boolean = true): Event? {
+        try {
            val tagger = NewMessageTagger(message.text, mentions, replyTos, originalNote?.channelHex())
            tagger.run()

@@ -186,12 +187,13 @@ open class NewPostViewModel() : ViewModel() {

            if (originalNote?.channelHex() != null) {
                if (originalNote is AddressableEvent && originalNote?.address() != null) {
-                account?.sendLiveMessage(tagger.message, originalNote?.address()!!, tagger.replyTos, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount, geoHash)
+                    return account?.sendLiveMessage(tagger.message, originalNote?.address()!!, tagger.replyTos, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount, geoHash, signEvent)
                } else {
-                account?.sendChannelMessage(tagger.message, tagger.channelHex!!, tagger.replyTos, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount, geoHash)
+                    return account?.sendChannelMessage(tagger.message, tagger.channelHex!!, tagger.replyTos, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount, geoHash, signEvent)
                }
            } else if (originalNote?.event is PrivateDmEvent) {
                account?.sendPrivateMessage(tagger.message, originalNote!!.author!!, originalNote!!, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount, geoHash)
+                return null
            } else if (originalNote?.event is ChatMessageEvent) {
                val receivers = (originalNote?.event as ChatMessageEvent).recipientsPubKey().plus(originalNote?.author?.pubkeyHex).filterNotNull().toSet().toList()

@@ -206,6 +208,7 @@ open class NewPostViewModel() : ViewModel() {
                    zapRaiserAmount = localZapRaiserAmount,
                    geohash = geoHash
                )
+                return null
            } else if (!dmUsers.isNullOrEmpty()) {
                if (nip24 || dmUsers.size > 1) {
                    account?.sendNIP24PrivateMessage(
@@ -219,6 +222,7 @@ open class NewPostViewModel() : ViewModel() {
                        zapRaiserAmount = localZapRaiserAmount,
                        geohash = geoHash
                    )
+                    return null
                } else {
                    account?.sendPrivateMessage(
                        message = tagger.message,
@@ -230,10 +234,11 @@ open class NewPostViewModel() : ViewModel() {
                        zapRaiserAmount = localZapRaiserAmount,
                        geohash = geoHash
                    )
+                    return null
                }
            } else {
                if (wantsPoll) {
-                account?.sendPoll(
+                    return account?.sendPoll(
                        tagger.message,
                        tagger.replyTos,
                        tagger.mentions,
@@ -246,7 +251,8 @@ open class NewPostViewModel() : ViewModel() {
                        wantsToMarkAsSensitive,
                        localZapRaiserAmount,
                        relayList,
-                    geoHash
+                        geoHash,
+                        signEvent
                    )
                } else {
                    // adds markers
@@ -256,7 +262,7 @@ open class NewPostViewModel() : ViewModel() {
                            ?: originalNote?.replyTo?.firstOrNull()?.idHex // old rules, first item is root.
                    val replyId = originalNote?.idHex

-                account?.sendPost(
+                    return account?.sendPost(
                        message = tagger.message,
                        replyTo = tagger.replyTos,
                        mentions = tagger.mentions,
@@ -268,13 +274,15 @@ open class NewPostViewModel() : ViewModel() {
                        root = rootId,
                        directMentions = tagger.directMentions,
                        relayList = relayList,
-                    geohash = geoHash
+                        geohash = geoHash,
+                        signEvent = signEvent
                    )
                }
            }
-
+        } finally {
            cancel()
        }
+    }

    fun upload(galleryUri: Uri, description: String, sensitiveContent: Boolean, server: ServersAvailable, context: Context, relayList: List<Relay>? = null) {
        isUploadingImage = true