oxen-io
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: alias saved messages with note to self

This commit is contained in:
Kee Jefferys 2023-10-17 19:35:40 +11:00
parent 954a1a7002
commit 143753566d
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
_locales/en/messages.json
View File

@ -220,6 +220,7 @@
"youDisabledDisappearingMessages": "You disabled disappearing messages.", "youDisabledDisappearingMessages": "You disabled disappearing messages.",
"timerSetTo": "Disappearing message time set to $time$", "timerSetTo": "Disappearing message time set to $time$",
"noteToSelf": "Note to Self", "noteToSelf": "Note to Self",
"savedMessages": "Saved Messages",
"hideMenuBarTitle": "Hide Menu Bar", "hideMenuBarTitle": "Hide Menu Bar",
"hideMenuBarDescription": "Toggle system menu bar visibility.", "hideMenuBarDescription": "Toggle system menu bar visibility.",
"startConversation": "Start New Conversation", "startConversation": "Start New Conversation",

9
ts/state/ducks/search.ts
View File

@ -70,6 +70,7 @@ export function search(query: string): SearchResultsKickoffActionType {
async function doSearch(query: string): Promise<SearchResultsPayloadType> { async function doSearch(query: string): Promise<SearchResultsPayloadType> {
const options: SearchOptions = { const options: SearchOptions = {
noteToSelf: window.i18n('noteToSelf').toLowerCase(), noteToSelf: window.i18n('noteToSelf').toLowerCase(),
savedMessages: window.i18n('savedMessages').toLowerCase(),
ourNumber: UserUtils.getOurPubKeyStrFromCache(), ourNumber: UserUtils.getOurPubKeyStrFromCache(),
}; };
const advancedSearchOptions = getAdvancedSearchOptionsFromQuery(query); const advancedSearchOptions = getAdvancedSearchOptionsFromQuery(query);
@ -200,7 +201,7 @@ async function queryMessages(query: string): Promise<Array<MessageResultProps>>
} }
async function queryConversationsAndContacts(providedQuery: string, options: SearchOptions) { async function queryConversationsAndContacts(providedQuery: string, options: SearchOptions) {
const { ourNumber, noteToSelf } = options; const { ourNumber, noteToSelf, savedMessages } = options;
const query = providedQuery.replace(/[+-.()]*/g, ''); const query = providedQuery.replace(/[+-.()]*/g, '');
const searchResults: Array<ReduxConversationType> = await Data.searchConversations(query); const searchResults: Array<ReduxConversationType> = await Data.searchConversations(query);
@ -224,9 +225,11 @@ async function queryConversationsAndContacts(providedQuery: string, options: Sea
conversations.push(conversation.id); conversations.push(conversation.id);
} }
} }
const queryLowered = providedQuery.toLowerCase();
// Inject synthetic Note to Self entry if query matches localized 'Note to Self' // Inject synthetic Note to Self entry if query matches localized 'Note to Self'
if (noteToSelf.indexOf(providedQuery.toLowerCase()) !== -1) { if (noteToSelf.includes(queryLowered) || savedMessages.includes(queryLowered)) {
// ensure that we don't have duplicates in our results // Ensure that we don't have duplicates in our results
contacts = contacts.filter(id => id !== ourNumber); contacts = contacts.filter(id => id !== ourNumber);
conversations = conversations.filter(id => id !== ourNumber); conversations = conversations.filter(id => id !== ourNumber);

1
ts/types/LocalizerKeys.ts
View File

@ -385,6 +385,7 @@ export type LocalizerKeys =
| 'save' | 'save'
| 'saveLogToDesktop' | 'saveLogToDesktop'
| 'saved' | 'saved'
| 'savedMessages'
| 'savedTheFile' | 'savedTheFile'
| 'searchFor...' | 'searchFor...'
| 'searchForContactsOnly' | 'searchForContactsOnly'

1
ts/types/Search.ts
View File

@ -1,6 +1,7 @@
export type SearchOptions = { export type SearchOptions = {
ourNumber: string; ourNumber: string;
noteToSelf: string; noteToSelf: string;
savedMessages: string;
}; };
export type AdvancedSearchOptions = { export type AdvancedSearchOptions = {