fix: unread issue

Author: shenjinti

crates/restsend-wasm/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "restsend-wasm"
-version = "1.2.2"
+version = "1.2.3"
 edition = "2021"
 description = "Restsend  Instant Messaging Javascript/Wasm SDK"
 authors = ["Restsend Team <[email protected]>"]

crates/restsend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "restsend-sdk"
-version = "1.1.9"
+version = "1.1.11"
 edition = "2021"
 
 [lib]

crates/restsend/src/client/conversation.rs

@@ -305,9 +305,27 @@ impl Client {
                 continue;
             }
             let start_seq = c.start_seq.max(c.last_read_seq);
+            let unread_diff = c.last_seq - c.last_read_seq;
+            if unread_diff <= 0 {
+                continue;
+            }
+
+            if unread_diff >= MAX_LOGS_LIMIT as i64 {
+                if c.unread < MAX_LOGS_LIMIT as i64 {
+                    c.unread = unread_diff;
+                    let t = self.store.message_storage.table::<Conversation>().await;
+                    t.set("", &c.topic_id, Some(c)).await.ok();
+                    continue;
+                }
+            }
             let logs = match self
                 .store
-                .get_chat_logs(&c.topic_id, start_seq, None, MAX_LOGS_LIMIT)
+                .get_chat_logs(
+                    &c.topic_id,
+                    start_seq,
+                    Some(c.last_seq),
+                    unread_diff.max(MAX_LOGS_LIMIT as i64) as u32,
+                )
                 .await
             {
                 Ok((logs, _)) => logs,
@@ -412,6 +430,12 @@ impl Client {
                 } else {
                     ChatLogStatus::Received
                 };
+                c.is_countable =
+                    if let Some(cb) = self.store.countable_callback.read().unwrap().as_ref() {
+                        cb.is_countable(c.content.clone())
+                    } else {
+                        !c.content.unreadable
+                    };
             }
             self.store.save_chat_logs(&lr.items).await.ok();
 
@@ -425,10 +449,6 @@ impl Client {
                 None => continue,
             };
 
-            if self.store.countable_callback.read().unwrap().is_some() {
-                conversation.unread = 0
-            }
-
             for c in lr.items.iter() {
                 if c.is_countable && c.seq > conversation.last_read_seq {
                     conversation.unread += 1;

js/package.json

@@ -5,7 +5,7 @@
     "Restsend Team <[email protected]>"
   ],
   "description": "Restsend  Instant Messaging Javascript/Wasm SDK",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "files": [
     "restsend_wasm_bg.wasm",
     "restsend_wasm.js",

js/restsend_wasm.d.ts

@@ -852,8 +852,8 @@ export interface InitOutput {
   readonly __wbindgen_export_4: WebAssembly.Table;
   readonly __wbindgen_export_5: WebAssembly.Table;
   readonly __wbindgen_free: (a: number, b: number, c: number) => void;
-  readonly closure634_externref_shim: (a: number, b: number, c: any) => void;
-  readonly _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf75a6e527d269343: (a: number, b: number) => void;
+  readonly closure633_externref_shim: (a: number, b: number, c: any) => void;
+  readonly _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hae1d08d0dc98b704: (a: number, b: number) => void;
   readonly closure843_externref_shim: (a: number, b: number, c: any) => void;
   readonly closure884_externref_shim: (a: number, b: number, c: any, d: any) => void;
   readonly __wbindgen_start: () => void;

js/restsend_wasm.js

@@ -287,11 +287,11 @@ export function setLogging(level) {
 }
 
 function __wbg_adapter_54(arg0, arg1, arg2) {
-    wasm.closure634_externref_shim(arg0, arg1, arg2);
+    wasm.closure633_externref_shim(arg0, arg1, arg2);
 }
 
-function __wbg_adapter_57(arg0, arg1) {
-    wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf75a6e527d269343(arg0, arg1);
+function __wbg_adapter_59(arg0, arg1) {
+    wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hae1d08d0dc98b704(arg0, arg1);
 }
 
 function __wbg_adapter_66(arg0, arg1, arg2) {
@@ -2344,7 +2344,7 @@ function __wbg_get_imports() {
     imports.wbg.__wbg_setRequestHeader_51d371ad5196f6ef = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
         arg0.setRequestHeader(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
     }, arguments) };
-    imports.wbg.__wbg_setTimeout_36de58ba0b8e4a16 = function(arg0, arg1) {
+    imports.wbg.__wbg_setTimeout_6db046170d8973ed = function(arg0, arg1) {
         setTimeout(arg0, arg1 >>> 0);
     };
     imports.wbg.__wbg_set_37837023f3d740e8 = function(arg0, arg1, arg2) {
@@ -2548,26 +2548,26 @@ function __wbg_get_imports() {
         return ret;
     };
     imports.wbg.__wbindgen_closure_wrapper1442 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 632, __wbg_adapter_54);
+        const ret = makeMutClosure(arg0, arg1, 631, __wbg_adapter_54);
         return ret;
     };
     imports.wbg.__wbindgen_closure_wrapper1443 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 632, __wbg_adapter_57);
+        const ret = makeMutClosure(arg0, arg1, 631, __wbg_adapter_54);
         return ret;
     };
     imports.wbg.__wbindgen_closure_wrapper1444 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 632, __wbg_adapter_54);
+        const ret = makeMutClosure(arg0, arg1, 631, __wbg_adapter_59);
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper1447 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 632, __wbg_adapter_54);
+    imports.wbg.__wbindgen_closure_wrapper1448 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 631, __wbg_adapter_54);
         return ret;
     };
     imports.wbg.__wbindgen_closure_wrapper1450 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 632, __wbg_adapter_54);
+        const ret = makeMutClosure(arg0, arg1, 631, __wbg_adapter_54);
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper2277 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper2276 = function(arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 844, __wbg_adapter_66);
         return ret;
     };

js/restsend_wasm_bg.wasm

@@ -103,8 +103,8 @@ export const __externref_table_alloc: () => number;
 export const __wbindgen_export_4: WebAssembly.Table;
 export const __wbindgen_export_5: WebAssembly.Table;
 export const __wbindgen_free: (a: number, b: number, c: number) => void;
-export const closure634_externref_shim: (a: number, b: number, c: any) => void;
-export const _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf75a6e527d269343: (a: number, b: number) => void;
+export const closure633_externref_shim: (a: number, b: number, c: any) => void;
+export const _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hae1d08d0dc98b704: (a: number, b: number) => void;
 export const closure843_externref_shim: (a: number, b: number, c: any) => void;
 export const closure884_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;

js/restsend_wasm_bg.wasm.d.ts

@@ -1176,8 +1176,6 @@ internal open class UniffiVTableCallbackInterfaceUploadCallback(
 
 
 
-
-
 
 
 
@@ -1354,8 +1352,6 @@ fun uniffi_restsend_sdk_checksum_method_client_sync_conversations(
 ): Short
 fun uniffi_restsend_sdk_checksum_method_client_transfer_topic(
 ): Short
-fun uniffi_restsend_sdk_checksum_method_client_try_sync_chat_logs(
-): Short
 fun uniffi_restsend_sdk_checksum_method_client_update_topic(
 ): Short
 fun uniffi_restsend_sdk_checksum_method_client_update_topic_notice(
@@ -1622,8 +1618,6 @@ fun uniffi_restsend_sdk_fn_method_client_sync_conversations(`ptr`: Pointer,`upda
 ): Long
 fun uniffi_restsend_sdk_fn_method_client_transfer_topic(`ptr`: Pointer,`topicId`: RustBuffer.ByValue,`userId`: RustBuffer.ByValue,
 ): Long
-fun uniffi_restsend_sdk_fn_method_client_try_sync_chat_logs(`ptr`: Pointer,`conversation`: RustBuffer.ByValue,`limit`: RustBuffer.ByValue,
-): Long
 fun uniffi_restsend_sdk_fn_method_client_update_topic(`ptr`: Pointer,`topicId`: RustBuffer.ByValue,`name`: RustBuffer.ByValue,`icon`: RustBuffer.ByValue,
 ): Long
 fun uniffi_restsend_sdk_fn_method_client_update_topic_notice(`ptr`: Pointer,`topicId`: RustBuffer.ByValue,`text`: RustBuffer.ByValue,
@@ -2021,9 +2015,6 @@ private fun uniffiCheckApiChecksums(lib: IntegrityCheckingUniffiLib) {
     if (lib.uniffi_restsend_sdk_checksum_method_client_transfer_topic() != 22182.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
-    if (lib.uniffi_restsend_sdk_checksum_method_client_try_sync_chat_logs() != 8690.toShort()) {
-        throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
-    }
     if (lib.uniffi_restsend_sdk_checksum_method_client_update_topic() != 54199.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
@@ -2713,8 +2704,6 @@ public interface ClientInterface {
 
     suspend fun `transferTopic`(`topicId`: kotlin.String, `userId`: kotlin.String)
 
-    suspend fun `trySyncChatLogs`(`conversation`: Conversation, `limit`: kotlin.UInt?): Conversation?
-    
     suspend fun `updateTopic`(`topicId`: kotlin.String, `name`: kotlin.String?, `icon`: kotlin.String?)
 
     suspend fun `updateTopicNotice`(`topicId`: kotlin.String, `text`: kotlin.String)
@@ -4248,26 +4237,6 @@ open class Client: Disposable, AutoCloseable, ClientInterface
     }
 
 
-    @Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
-    override suspend fun `trySyncChatLogs`(`conversation`: Conversation, `limit`: kotlin.UInt?) : Conversation? {
-        return uniffiRustCallAsync(
-        callWithPointer { thisPtr ->
-            UniffiLib.INSTANCE.uniffi_restsend_sdk_fn_method_client_try_sync_chat_logs(
-                thisPtr,
-                FfiConverterTypeConversation.lower(`conversation`),FfiConverterOptionalUInt.lower(`limit`),
-            )
-        },
-        { future, callback, continuation -> UniffiLib.INSTANCE.ffi_restsend_sdk_rust_future_poll_rust_buffer(future, callback, continuation) },
-        { future, continuation -> UniffiLib.INSTANCE.ffi_restsend_sdk_rust_future_complete_rust_buffer(future, continuation) },
-        { future -> UniffiLib.INSTANCE.ffi_restsend_sdk_rust_future_free_rust_buffer(future) },
-        // lift function
-        { FfiConverterOptionalTypeConversation.lift(it) },
-        // Error FFI converter
-        UniffiNullRustCallStatusErrorHandler,
-    )
-    }
-
-    
     @Throws(ClientException::class)
     @Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
     override suspend fun `updateTopic`(`topicId`: kotlin.String, `name`: kotlin.String?, `icon`: kotlin.String?) {

kotlin/uniffi/restsend_sdk/restsend_sdk.kt

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name        = "RestsendSdk"
-    s.version = "1.1.9"
+    s.version = "1.1.11"
     s.summary     = "Restsend client sdk for iOS"
     s.homepage    = "https://github.com/restsend/restsend-rs"
     s.license     = { :type => "MIT" }