From 143753566d1c269d92c029cc5b0d0e968317104a Mon Sep 17 00:00:00 2001
From: Kee Jefferys <kee@loki.network>
Date: Tue, 17 Oct 2023 19:35:40 +1100
Subject: [PATCH] feat: alias saved messages with note to self

---
 _locales/en/messages.json | 1 +
 ts/state/ducks/search.ts  | 9 ++++++---
 ts/types/LocalizerKeys.ts | 1 +
 ts/types/Search.ts        | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 09a67aa7b..a4f36fdf2 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -220,6 +220,7 @@
   "youDisabledDisappearingMessages": "You disabled disappearing messages.",
   "timerSetTo": "Disappearing message time set to $time$",
   "noteToSelf": "Note to Self",
+  "savedMessages": "Saved Messages",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
   "startConversation": "Start New Conversation",
diff --git a/ts/state/ducks/search.ts b/ts/state/ducks/search.ts
index b868d6c82..379bdd927 100644
--- a/ts/state/ducks/search.ts
+++ b/ts/state/ducks/search.ts
@@ -70,6 +70,7 @@ export function search(query: string): SearchResultsKickoffActionType {
 async function doSearch(query: string): Promise<SearchResultsPayloadType> {
   const options: SearchOptions = {
     noteToSelf: window.i18n('noteToSelf').toLowerCase(),
+    savedMessages: window.i18n('savedMessages').toLowerCase(),
     ourNumber: UserUtils.getOurPubKeyStrFromCache(),
   };
   const advancedSearchOptions = getAdvancedSearchOptionsFromQuery(query);
@@ -200,7 +201,7 @@ async function queryMessages(query: string): Promise<Array<MessageResultProps>>
 }
 
 async function queryConversationsAndContacts(providedQuery: string, options: SearchOptions) {
-  const { ourNumber, noteToSelf } = options;
+  const { ourNumber, noteToSelf, savedMessages } = options;
   const query = providedQuery.replace(/[+-.()]*/g, '');
 
   const searchResults: Array<ReduxConversationType> = await Data.searchConversations(query);
@@ -224,9 +225,11 @@ async function queryConversationsAndContacts(providedQuery: string, options: Sea
       conversations.push(conversation.id);
     }
   }
+
+  const queryLowered = providedQuery.toLowerCase();
   // Inject synthetic Note to Self entry if query matches localized 'Note to Self'
-  if (noteToSelf.indexOf(providedQuery.toLowerCase()) !== -1) {
-    // ensure that we don't have duplicates in our results
+  if (noteToSelf.includes(queryLowered) || savedMessages.includes(queryLowered)) {
+    // Ensure that we don't have duplicates in our results
     contacts = contacts.filter(id => id !== ourNumber);
     conversations = conversations.filter(id => id !== ourNumber);
 
diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts
index ed5d4ad7f..aaa404005 100644
--- a/ts/types/LocalizerKeys.ts
+++ b/ts/types/LocalizerKeys.ts
@@ -385,6 +385,7 @@ export type LocalizerKeys =
   | 'save'
   | 'saveLogToDesktop'
   | 'saved'
+  | 'savedMessages'
   | 'savedTheFile'
   | 'searchFor...'
   | 'searchForContactsOnly'
diff --git a/ts/types/Search.ts b/ts/types/Search.ts
index 282142267..0206be8a3 100644
--- a/ts/types/Search.ts
+++ b/ts/types/Search.ts
@@ -1,6 +1,7 @@
 export type SearchOptions = {
   ourNumber: string;
   noteToSelf: string;
+  savedMessages: string;
 };
 
 export type AdvancedSearchOptions = {