Page MenuHomePhabricator
Differential D13031

[lib] introduce resetting Outbound P2P Messages to `SQLiteAPI`
ClosedPublic
Actions

Authored by kamil on Aug 8 2024, 5:07 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Apr 4, 1:53 PM
Unknown Object (File)
Fri, Apr 4, 11:26 AM
Unknown Object (File)
Fri, Apr 4, 4:39 AM
Unknown Object (File)
Thu, Apr 3, 8:08 AM
Unknown Object (File)
Wed, Apr 2, 4:43 AM
Unknown Object (File)
Mar 12 2025, 12:18 AM
Unknown Object (File)
Feb 28 2025, 2:47 AM
Unknown Object (File)
Feb 25 2025, 10:14 AM
View All 72 Files
Subscribers
ashoat

Details

Reviewers
tomek
Commits
rCOMMd5e299a6a2fb: [lib] introduce resetting Outbound P2P Messages to `SQLiteAPI`
Summary

This diff introduces a shared interface on SQLiteAPI so the JS code in lib can use this API on both platforms.

Depends on D13030

Test Plan

Tested in D13032

Additionally, run this code:

const deviceID = 'deviceID';

await processDBStoreOperations({
  outboundP2PMessages: [
    {
      messageID: 'reset-1',
      deviceID,
      userID: 'user-1',
      timestamp: '1',
      plaintext: 'decrypted-1',
      ciphertext: 'encrypted-1',
      status: 'encrypted',
      supportsAutoRetry: true,
    },
    {
      messageID: 'reset-2',
      deviceID,
      userID: 'user-1',
      timestamp: '1',
      plaintext: 'decrypted-1',
      ciphertext: 'encrypted-1',
      status: 'sent',
      supportsAutoRetry: false,
    },
    {
      messageID: 'reset-3',
      deviceID,
      userID: 'user-1',
      timestamp: '3',
      plaintext: 'decrypted-1',
      ciphertext: 'encrypted-1',
      status: 'encrypted',
      supportsAutoRetry: false,
    },
  ],
});

const before = await sqliteAPI.getAllOutboundP2PMessages();
console.log(before.filter(msg => msg.deviceID === deviceID));
const ids =
  await sqliteAPI.resetOutboundP2PMessagesForDevice(deviceID);
console.log(ids);
const after = await sqliteAPI.getAllOutboundP2PMessages();
console.log(after.filter(msg => msg.deviceID === deviceID));

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
types/
3 lines
utils/
__mocks__/
1 line
native/
database/
2 lines
web/
database/
13 lines

Diff 43331

View Options

lib/types/sqlite-types.js

// @flow // @flow
import { oldValidUsernameRegexString } from './account-utils.js'; import { oldValidUsernameRegexString } from './account-utils.js';
import SentencePrefixSearchIndex from './sentence-prefix-search-index.js'; import SentencePrefixSearchIndex from './sentence-prefix-search-index.js';
import { threadOtherMembers } from './thread-utils.js'; import { threadOtherMembers } from './thread-utils.js';
import { stringForUserExplicit } from './user-utils.js'; import { stringForUserExplicit } from './user-utils.js';
import type { import type {
MinimallyEncodedRelativeMemberInfo, MinimallyEncodedRelativeMemberInfo,
MinimallyEncodedResolvedThreadInfo, MinimallyEncodedResolvedThreadInfo,
MinimallyEncodedThreadInfo, MinimallyEncodedThreadInfo,
} from '../types/minimally-encoded-thread-permissions-types.js'; } from '../types/minimally-encoded-thread-permissions-types.js';
import { threadTypes } from '../types/thread-types-enum.js'; import { threadTypes } from '../types/thread-types-enum.js';
import type { import type {
ThreadInfo, ThreadInfo,
RelativeMemberInfo, LegacyRelativeMemberInfo,
ResolvedThreadInfo, ResolvedThreadInfo,
ChatMentionCandidates, ChatMentionCandidates,
} from '../types/thread-types.js'; } from '../types/thread-types.js';
import { idSchemaRegex, chatNameMaxLength } from '../utils/validation-utils.js'; import { idSchemaRegex, chatNameMaxLength } from '../utils/validation-utils.js';
export type TypeaheadMatchedStrings = { export type TypeaheadMatchedStrings = {
+textBeforeAtSymbol: string, +textBeforeAtSymbol: string,
+query: string, +query: string,
}; };
export type Selection = { export type Selection = {
+start: number, +start: number,
+end: number, +end: number,
}; };
type MentionTypeaheadUserSuggestionItem = { type MentionTypeaheadUserSuggestionItem = {
+type: 'user', +type: 'user',
+userInfo: RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo, +userInfo: LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
}; };
type MentionTypeaheadChatSuggestionItem = { type MentionTypeaheadChatSuggestionItem = {
+type: 'chat', +type: 'chat',
+threadInfo: ResolvedThreadInfo | MinimallyEncodedResolvedThreadInfo, +threadInfo: ResolvedThreadInfo | MinimallyEncodedResolvedThreadInfo,
}; };
export type MentionTypeaheadSuggestionItem = export type MentionTypeaheadSuggestionItem =
▲ Show 20 Lines • Show All 63 Lines • ▼ Show 20 Lines ) {
return text.slice(0, selection.start).match(regex); return text.slice(0, selection.start).match(regex);
} }
return null; return null;
} }
function getMentionTypeaheadUserSuggestions( function getMentionTypeaheadUserSuggestions(
userSearchIndex: SentencePrefixSearchIndex, userSearchIndex: SentencePrefixSearchIndex,
threadMembers: $ReadOnlyArray< threadMembers: $ReadOnlyArray<
RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo, LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
>, >,
viewerID: ?string, viewerID: ?string,
usernamePrefix: string, usernamePrefix: string,
): $ReadOnlyArray<MentionTypeaheadUserSuggestionItem> { ): $ReadOnlyArray<MentionTypeaheadUserSuggestionItem> {
const userIDs = userSearchIndex.getSearchResults(usernamePrefix); const userIDs = userSearchIndex.getSearchResults(usernamePrefix);
const usersInThread = threadOtherMembers(threadMembers, viewerID); const usersInThread = threadOtherMembers(threadMembers, viewerID);
return usersInThread return usersInThread
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines): {
const newSelectionStart = newText.length - newSuffixText.length + 1; const newSelectionStart = newText.length - newSuffixText.length + 1;
return { newText, newSelectionStart }; return { newText, newSelectionStart };
} }
function getUserMentionsCandidates( function getUserMentionsCandidates(
threadInfo: ThreadInfo | MinimallyEncodedThreadInfo, threadInfo: ThreadInfo | MinimallyEncodedThreadInfo,
parentThreadInfo: ?ThreadInfo | ?MinimallyEncodedThreadInfo, parentThreadInfo: ?ThreadInfo | ?MinimallyEncodedThreadInfo,
): $ReadOnlyArray<RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo> { ): $ReadOnlyArray<
LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
> {
if (threadInfo.type !== threadTypes.SIDEBAR) { if (threadInfo.type !== threadTypes.SIDEBAR) {
return threadInfo.members; return threadInfo.members;
} }
if (parentThreadInfo) { if (parentThreadInfo) {
return parentThreadInfo.members; return parentThreadInfo.members;
} }
// This scenario should not occur unless the user logs out while looking at a // This scenario should not occur unless the user logs out while looking at a
// sidebar. In that scenario, the Redux store may be cleared before ReactNav // sidebar. In that scenario, the Redux store may be cleared before ReactNav
Show All 19 Lines
View Options

lib/utils/__mocks__/config.js

// @flow // @flow
import { oldValidUsernameRegexString } from './account-utils.js'; import { oldValidUsernameRegexString } from './account-utils.js';
import SentencePrefixSearchIndex from './sentence-prefix-search-index.js'; import SentencePrefixSearchIndex from './sentence-prefix-search-index.js';
import { threadOtherMembers } from './thread-utils.js'; import { threadOtherMembers } from './thread-utils.js';
import { stringForUserExplicit } from './user-utils.js'; import { stringForUserExplicit } from './user-utils.js';
import type { import type {
MinimallyEncodedRelativeMemberInfo, MinimallyEncodedRelativeMemberInfo,
MinimallyEncodedResolvedThreadInfo, MinimallyEncodedResolvedThreadInfo,
MinimallyEncodedThreadInfo, MinimallyEncodedThreadInfo,
} from '../types/minimally-encoded-thread-permissions-types.js'; } from '../types/minimally-encoded-thread-permissions-types.js';
import { threadTypes } from '../types/thread-types-enum.js'; import { threadTypes } from '../types/thread-types-enum.js';
import type { import type {
ThreadInfo, ThreadInfo,
RelativeMemberInfo, LegacyRelativeMemberInfo,
ResolvedThreadInfo, ResolvedThreadInfo,
ChatMentionCandidates, ChatMentionCandidates,
} from '../types/thread-types.js'; } from '../types/thread-types.js';
import { idSchemaRegex, chatNameMaxLength } from '../utils/validation-utils.js'; import { idSchemaRegex, chatNameMaxLength } from '../utils/validation-utils.js';
export type TypeaheadMatchedStrings = { export type TypeaheadMatchedStrings = {
+textBeforeAtSymbol: string, +textBeforeAtSymbol: string,
+query: string, +query: string,
}; };
export type Selection = { export type Selection = {
+start: number, +start: number,
+end: number, +end: number,
}; };
type MentionTypeaheadUserSuggestionItem = { type MentionTypeaheadUserSuggestionItem = {
+type: 'user', +type: 'user',
+userInfo: RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo, +userInfo: LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
}; };
type MentionTypeaheadChatSuggestionItem = { type MentionTypeaheadChatSuggestionItem = {
+type: 'chat', +type: 'chat',
+threadInfo: ResolvedThreadInfo | MinimallyEncodedResolvedThreadInfo, +threadInfo: ResolvedThreadInfo | MinimallyEncodedResolvedThreadInfo,
}; };
export type MentionTypeaheadSuggestionItem = export type MentionTypeaheadSuggestionItem =
▲ Show 20 Lines • Show All 63 Lines • ▼ Show 20 Lines ) {
return text.slice(0, selection.start).match(regex); return text.slice(0, selection.start).match(regex);
} }
return null; return null;
} }
function getMentionTypeaheadUserSuggestions( function getMentionTypeaheadUserSuggestions(
userSearchIndex: SentencePrefixSearchIndex, userSearchIndex: SentencePrefixSearchIndex,
threadMembers: $ReadOnlyArray< threadMembers: $ReadOnlyArray<
RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo, LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
>, >,
viewerID: ?string, viewerID: ?string,
usernamePrefix: string, usernamePrefix: string,
): $ReadOnlyArray<MentionTypeaheadUserSuggestionItem> { ): $ReadOnlyArray<MentionTypeaheadUserSuggestionItem> {
const userIDs = userSearchIndex.getSearchResults(usernamePrefix); const userIDs = userSearchIndex.getSearchResults(usernamePrefix);
const usersInThread = threadOtherMembers(threadMembers, viewerID); const usersInThread = threadOtherMembers(threadMembers, viewerID);
return usersInThread return usersInThread
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines): {
const newSelectionStart = newText.length - newSuffixText.length + 1; const newSelectionStart = newText.length - newSuffixText.length + 1;
return { newText, newSelectionStart }; return { newText, newSelectionStart };
} }
function getUserMentionsCandidates( function getUserMentionsCandidates(
threadInfo: ThreadInfo | MinimallyEncodedThreadInfo, threadInfo: ThreadInfo | MinimallyEncodedThreadInfo,
parentThreadInfo: ?ThreadInfo | ?MinimallyEncodedThreadInfo, parentThreadInfo: ?ThreadInfo | ?MinimallyEncodedThreadInfo,
): $ReadOnlyArray<RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo> { ): $ReadOnlyArray<
LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
> {
if (threadInfo.type !== threadTypes.SIDEBAR) { if (threadInfo.type !== threadTypes.SIDEBAR) {
return threadInfo.members; return threadInfo.members;
} }
if (parentThreadInfo) { if (parentThreadInfo) {
return parentThreadInfo.members; return parentThreadInfo.members;
} }
// This scenario should not occur unless the user logs out while looking at a // This scenario should not occur unless the user logs out while looking at a
// sidebar. In that scenario, the Redux store may be cleared before ReactNav // sidebar. In that scenario, the Redux store may be cleared before ReactNav
Show All 19 Lines
View Options

native/database/sqlite-api.js

// @flow // @flow
import { oldValidUsernameRegexString } from './account-utils.js'; import { oldValidUsernameRegexString } from './account-utils.js';
import SentencePrefixSearchIndex from './sentence-prefix-search-index.js'; import SentencePrefixSearchIndex from './sentence-prefix-search-index.js';
import { threadOtherMembers } from './thread-utils.js'; import { threadOtherMembers } from './thread-utils.js';
import { stringForUserExplicit } from './user-utils.js'; import { stringForUserExplicit } from './user-utils.js';
import type { import type {
MinimallyEncodedRelativeMemberInfo, MinimallyEncodedRelativeMemberInfo,
MinimallyEncodedResolvedThreadInfo, MinimallyEncodedResolvedThreadInfo,
MinimallyEncodedThreadInfo, MinimallyEncodedThreadInfo,
} from '../types/minimally-encoded-thread-permissions-types.js'; } from '../types/minimally-encoded-thread-permissions-types.js';
import { threadTypes } from '../types/thread-types-enum.js'; import { threadTypes } from '../types/thread-types-enum.js';
import type { import type {
ThreadInfo, ThreadInfo,
RelativeMemberInfo, LegacyRelativeMemberInfo,
ResolvedThreadInfo, ResolvedThreadInfo,
ChatMentionCandidates, ChatMentionCandidates,
} from '../types/thread-types.js'; } from '../types/thread-types.js';
import { idSchemaRegex, chatNameMaxLength } from '../utils/validation-utils.js'; import { idSchemaRegex, chatNameMaxLength } from '../utils/validation-utils.js';
export type TypeaheadMatchedStrings = { export type TypeaheadMatchedStrings = {
+textBeforeAtSymbol: string, +textBeforeAtSymbol: string,
+query: string, +query: string,
}; };
export type Selection = { export type Selection = {
+start: number, +start: number,
+end: number, +end: number,
}; };
type MentionTypeaheadUserSuggestionItem = { type MentionTypeaheadUserSuggestionItem = {
+type: 'user', +type: 'user',
+userInfo: RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo, +userInfo: LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
}; };
type MentionTypeaheadChatSuggestionItem = { type MentionTypeaheadChatSuggestionItem = {
+type: 'chat', +type: 'chat',
+threadInfo: ResolvedThreadInfo | MinimallyEncodedResolvedThreadInfo, +threadInfo: ResolvedThreadInfo | MinimallyEncodedResolvedThreadInfo,
}; };
export type MentionTypeaheadSuggestionItem = export type MentionTypeaheadSuggestionItem =
▲ Show 20 Lines • Show All 63 Lines • ▼ Show 20 Lines ) {
return text.slice(0, selection.start).match(regex); return text.slice(0, selection.start).match(regex);
} }
return null; return null;
} }
function getMentionTypeaheadUserSuggestions( function getMentionTypeaheadUserSuggestions(
userSearchIndex: SentencePrefixSearchIndex, userSearchIndex: SentencePrefixSearchIndex,
threadMembers: $ReadOnlyArray< threadMembers: $ReadOnlyArray<
RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo, LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
>, >,
viewerID: ?string, viewerID: ?string,
usernamePrefix: string, usernamePrefix: string,
): $ReadOnlyArray<MentionTypeaheadUserSuggestionItem> { ): $ReadOnlyArray<MentionTypeaheadUserSuggestionItem> {
const userIDs = userSearchIndex.getSearchResults(usernamePrefix); const userIDs = userSearchIndex.getSearchResults(usernamePrefix);
const usersInThread = threadOtherMembers(threadMembers, viewerID); const usersInThread = threadOtherMembers(threadMembers, viewerID);
return usersInThread return usersInThread
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines): {
const newSelectionStart = newText.length - newSuffixText.length + 1; const newSelectionStart = newText.length - newSuffixText.length + 1;
return { newText, newSelectionStart }; return { newText, newSelectionStart };
} }
function getUserMentionsCandidates( function getUserMentionsCandidates(
threadInfo: ThreadInfo | MinimallyEncodedThreadInfo, threadInfo: ThreadInfo | MinimallyEncodedThreadInfo,
parentThreadInfo: ?ThreadInfo | ?MinimallyEncodedThreadInfo, parentThreadInfo: ?ThreadInfo | ?MinimallyEncodedThreadInfo,
): $ReadOnlyArray<RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo> { ): $ReadOnlyArray<
LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
> {
if (threadInfo.type !== threadTypes.SIDEBAR) { if (threadInfo.type !== threadTypes.SIDEBAR) {
return threadInfo.members; return threadInfo.members;
} }
if (parentThreadInfo) { if (parentThreadInfo) {
return parentThreadInfo.members; return parentThreadInfo.members;
} }
// This scenario should not occur unless the user logs out while looking at a // This scenario should not occur unless the user logs out while looking at a
// sidebar. In that scenario, the Redux store may be cleared before ReactNav // sidebar. In that scenario, the Redux store may be cleared before ReactNav
Show All 19 Lines
View Options

web/database/sqlite-api.js

// @flow // @flow
import { oldValidUsernameRegexString } from './account-utils.js'; import { oldValidUsernameRegexString } from './account-utils.js';
import SentencePrefixSearchIndex from './sentence-prefix-search-index.js'; import SentencePrefixSearchIndex from './sentence-prefix-search-index.js';
import { threadOtherMembers } from './thread-utils.js'; import { threadOtherMembers } from './thread-utils.js';
import { stringForUserExplicit } from './user-utils.js'; import { stringForUserExplicit } from './user-utils.js';
import type { import type {
MinimallyEncodedRelativeMemberInfo, MinimallyEncodedRelativeMemberInfo,
MinimallyEncodedResolvedThreadInfo, MinimallyEncodedResolvedThreadInfo,
MinimallyEncodedThreadInfo, MinimallyEncodedThreadInfo,
} from '../types/minimally-encoded-thread-permissions-types.js'; } from '../types/minimally-encoded-thread-permissions-types.js';
import { threadTypes } from '../types/thread-types-enum.js'; import { threadTypes } from '../types/thread-types-enum.js';
import type { import type {
ThreadInfo, ThreadInfo,
RelativeMemberInfo, LegacyRelativeMemberInfo,
ResolvedThreadInfo, ResolvedThreadInfo,
ChatMentionCandidates, ChatMentionCandidates,
} from '../types/thread-types.js'; } from '../types/thread-types.js';
import { idSchemaRegex, chatNameMaxLength } from '../utils/validation-utils.js'; import { idSchemaRegex, chatNameMaxLength } from '../utils/validation-utils.js';
export type TypeaheadMatchedStrings = { export type TypeaheadMatchedStrings = {
+textBeforeAtSymbol: string, +textBeforeAtSymbol: string,
+query: string, +query: string,
}; };
export type Selection = { export type Selection = {
+start: number, +start: number,
+end: number, +end: number,
}; };
type MentionTypeaheadUserSuggestionItem = { type MentionTypeaheadUserSuggestionItem = {
+type: 'user', +type: 'user',
+userInfo: RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo, +userInfo: LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
}; };
type MentionTypeaheadChatSuggestionItem = { type MentionTypeaheadChatSuggestionItem = {
+type: 'chat', +type: 'chat',
+threadInfo: ResolvedThreadInfo | MinimallyEncodedResolvedThreadInfo, +threadInfo: ResolvedThreadInfo | MinimallyEncodedResolvedThreadInfo,
}; };
export type MentionTypeaheadSuggestionItem = export type MentionTypeaheadSuggestionItem =
▲ Show 20 Lines • Show All 63 Lines • ▼ Show 20 Lines ) {
return text.slice(0, selection.start).match(regex); return text.slice(0, selection.start).match(regex);
} }
return null; return null;
} }
function getMentionTypeaheadUserSuggestions( function getMentionTypeaheadUserSuggestions(
userSearchIndex: SentencePrefixSearchIndex, userSearchIndex: SentencePrefixSearchIndex,
threadMembers: $ReadOnlyArray< threadMembers: $ReadOnlyArray<
RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo, LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
>, >,
viewerID: ?string, viewerID: ?string,
usernamePrefix: string, usernamePrefix: string,
): $ReadOnlyArray<MentionTypeaheadUserSuggestionItem> { ): $ReadOnlyArray<MentionTypeaheadUserSuggestionItem> {
const userIDs = userSearchIndex.getSearchResults(usernamePrefix); const userIDs = userSearchIndex.getSearchResults(usernamePrefix);
const usersInThread = threadOtherMembers(threadMembers, viewerID); const usersInThread = threadOtherMembers(threadMembers, viewerID);
return usersInThread return usersInThread
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines): {
const newSelectionStart = newText.length - newSuffixText.length + 1; const newSelectionStart = newText.length - newSuffixText.length + 1;
return { newText, newSelectionStart }; return { newText, newSelectionStart };
} }
function getUserMentionsCandidates( function getUserMentionsCandidates(
threadInfo: ThreadInfo | MinimallyEncodedThreadInfo, threadInfo: ThreadInfo | MinimallyEncodedThreadInfo,
parentThreadInfo: ?ThreadInfo | ?MinimallyEncodedThreadInfo, parentThreadInfo: ?ThreadInfo | ?MinimallyEncodedThreadInfo,
): $ReadOnlyArray<RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo> { ): $ReadOnlyArray<
LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
> {
if (threadInfo.type !== threadTypes.SIDEBAR) { if (threadInfo.type !== threadTypes.SIDEBAR) {
return threadInfo.members; return threadInfo.members;
} }
if (parentThreadInfo) { if (parentThreadInfo) {
return parentThreadInfo.members; return parentThreadInfo.members;
} }
// This scenario should not occur unless the user logs out while looking at a // This scenario should not occur unless the user logs out while looking at a
// sidebar. In that scenario, the Redux store may be cleared before ReactNav // sidebar. In that scenario, the Redux store may be cleared before ReactNav
Show All 19 Lines