Page MenuHomePhorge
Files F33597654

D12853.1769114979.diff
No OneTemporary
Actions

Size
6 KB
Referenced Files
None
Subscribers
None

D12853.1769114979.diff
View Options

diff --git a/native/cpp/CommonCpp/NativeModules/CommCoreModule.h b/native/cpp/CommonCpp/NativeModules/CommCoreModule.h
--- a/native/cpp/CommonCpp/NativeModules/CommCoreModule.h
+++ b/native/cpp/CommonCpp/NativeModules/CommCoreModule.h
@@ -237,6 +237,12 @@
virtual jsi::Value markPrekeysAsPublished(jsi::Runtime &rt) override;
virtual jsi::Value
getRelatedMessages(jsi::Runtime &rt, jsi::String messageID) override;
+ virtual jsi::Value searchMessages(
+ jsi::Runtime &rt,
+ jsi::String query,
+ jsi::String threadID,
+ std::optional<jsi::String> timestampCursor,
+ std::optional<jsi::String> messageIDCursor) override;
public:
CommCoreModule(std::shared_ptr<facebook::react::CallInvoker> jsInvoker);
diff --git a/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp b/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp
--- a/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp
+++ b/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp
@@ -2698,4 +2698,59 @@
});
}
+jsi::Value CommCoreModule::searchMessages(
+ jsi::Runtime &rt,
+ jsi::String query,
+ jsi::String threadID,
+ std::optional<jsi::String> timestampCursor,
+ std::optional<jsi::String> messageIDCursor) {
+ std::string queryStr = query.utf8(rt);
+ std::string threadIDStr = threadID.utf8(rt);
+
+ std::optional<std::string> timestampCursorCpp;
+ if (timestampCursor) {
+ timestampCursorCpp = timestampCursor->utf8(rt);
+ }
+
+ std::optional<std::string> messageIDCursorCpp;
+ if (messageIDCursor) {
+ messageIDCursorCpp = messageIDCursor->utf8(rt);
+ }
+
+ return createPromiseAsJSIValue(
+ rt, [=](jsi::Runtime &innerRt, std::shared_ptr<Promise> promise) {
+ taskType job = [=, &innerRt]() {
+ std::string error;
+ std::shared_ptr<std::vector<MessageEntity>> messages;
+ try {
+ messages = std::make_shared<std::vector<MessageEntity>>(
+ DatabaseManager::getQueryExecutor().searchMessages(
+ queryStr,
+ threadIDStr,
+ timestampCursorCpp,
+ messageIDCursorCpp));
+ } catch (std::system_error &e) {
+ error = e.what();
+ }
+
+ this->jsInvoker_->invokeAsync([&innerRt,
+ error,
+ promise,
+ messages,
+ messageStore = this->messageStore]() {
+ if (error.size()) {
+ promise->reject(error);
+ return;
+ }
+
+ jsi::Array jsiMessages =
+ messageStore.parseDBDataStore(innerRt, messages);
+ promise->resolve(std::move(jsiMessages));
+ });
+ };
+ GlobalDBSingleton::instance.scheduleOrRunCancellable(
+ job, promise, this->jsInvoker_);
+ });
+};
+
} // namespace comm
diff --git a/native/cpp/CommonCpp/_generated/commJSI-generated.cpp b/native/cpp/CommonCpp/_generated/commJSI-generated.cpp
--- a/native/cpp/CommonCpp/_generated/commJSI-generated.cpp
+++ b/native/cpp/CommonCpp/_generated/commJSI-generated.cpp
@@ -214,6 +214,9 @@
static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_getRelatedMessages(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->getRelatedMessages(rt, args[0].asString(rt));
}
+static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_searchMessages(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+ return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->searchMessages(rt, args[0].asString(rt), args[1].asString(rt), args[2].isNull() || args[2].isUndefined() ? std::nullopt : std::make_optional(args[2].asString(rt)), args[3].isNull() || args[3].isUndefined() ? std::nullopt : std::make_optional(args[3].asString(rt)));
+}
CommCoreModuleSchemaCxxSpecJSI::CommCoreModuleSchemaCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
: TurboModule("CommTurboModule", jsInvoker) {
@@ -282,6 +285,7 @@
methodMap_["getSyncedDatabaseVersion"] = MethodMetadata {0, __hostFunction_CommCoreModuleSchemaCxxSpecJSI_getSyncedDatabaseVersion};
methodMap_["markPrekeysAsPublished"] = MethodMetadata {0, __hostFunction_CommCoreModuleSchemaCxxSpecJSI_markPrekeysAsPublished};
methodMap_["getRelatedMessages"] = MethodMetadata {1, __hostFunction_CommCoreModuleSchemaCxxSpecJSI_getRelatedMessages};
+ methodMap_["searchMessages"] = MethodMetadata {4, __hostFunction_CommCoreModuleSchemaCxxSpecJSI_searchMessages};
}
diff --git a/native/cpp/CommonCpp/_generated/commJSI.h b/native/cpp/CommonCpp/_generated/commJSI.h
--- a/native/cpp/CommonCpp/_generated/commJSI.h
+++ b/native/cpp/CommonCpp/_generated/commJSI.h
@@ -85,6 +85,7 @@
virtual jsi::Value getSyncedDatabaseVersion(jsi::Runtime &rt) = 0;
virtual jsi::Value markPrekeysAsPublished(jsi::Runtime &rt) = 0;
virtual jsi::Value getRelatedMessages(jsi::Runtime &rt, jsi::String messageID) = 0;
+ virtual jsi::Value searchMessages(jsi::Runtime &rt, jsi::String query, jsi::String threadID, std::optional<jsi::String> timestampCursor, std::optional<jsi::String> messageIDCursor) = 0;
};
@@ -626,6 +627,14 @@
return bridging::callFromJs<jsi::Value>(
rt, &T::getRelatedMessages, jsInvoker_, instance_, std::move(messageID));
}
+ jsi::Value searchMessages(jsi::Runtime &rt, jsi::String query, jsi::String threadID, std::optional<jsi::String> timestampCursor, std::optional<jsi::String> messageIDCursor) override {
+ static_assert(
+ bridging::getParameterCount(&T::searchMessages) == 5,
+ "Expected searchMessages(...) to have 5 parameters");
+
+ return bridging::callFromJs<jsi::Value>(
+ rt, &T::searchMessages, jsInvoker_, instance_, std::move(query), std::move(threadID), std::move(timestampCursor), std::move(messageIDCursor));
+ }
private:
T *instance_;
diff --git a/native/schema/CommCoreModuleSchema.js b/native/schema/CommCoreModuleSchema.js
--- a/native/schema/CommCoreModuleSchema.js
+++ b/native/schema/CommCoreModuleSchema.js
@@ -169,6 +169,12 @@
+getSyncedDatabaseVersion: () => Promise<string>;
+markPrekeysAsPublished: () => Promise<void>;
+getRelatedMessages: (messageID: string) => Promise<ClientDBMessageInfo[]>;
+ +searchMessages: (
+ query: string,
+ threadID: string,
+ timestampCursor: ?string,
+ messageIDCursor: ?string,
+ ) => Promise<ClientDBMessageInfo[]>;
}
export interface CoreModuleSpec extends Spec {

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 22, 8:49 PM (17 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5980306
Default Alt Text
D12853.1769114979.diff (6 KB)

Event Timeline