Page MenuHomePhabricator
Differential D8627

[Identity] Remove static lifetime constraint on DBItemError
ClosedPublic
Actions

Authored by • jon on Jul 25 2023, 10:44 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Apr 18, 9:03 AM
Unknown Object (File)
Fri, Apr 18, 7:44 AM
Unknown Object (File)
Fri, Apr 18, 2:42 AM
Unknown Object (File)
Thu, Apr 17, 12:55 PM
Unknown Object (File)
Tue, Apr 8, 4:17 PM
Unknown Object (File)
Wed, Mar 26, 11:51 AM
Unknown Object (File)
Mar 19 2025, 4:00 PM
Unknown Object (File)
Mar 17 2025, 12:18 AM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
bartek
varun
Commits
rCOMM83836ecf16b7: [Identity] Remove static lifetime constraint on DBItemError
Summary

In order to support device maps, we can't assume
that all attribute keys will be known staticly.

In support of https://linear.app/comm/issue/ENG-4445

Depends on D8607

Test Plan
cd identity && cargo build

or run any integration tests

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
services/
identity/
src/
32 lines
2 lines

Diff 29628

View Options

services/identity/src/database.rs

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { messageID } from './message-utils.js';
import SearchIndex from './search-index.js'; import SearchIndex from './search-index.js';
import { import {
userIsMember, userIsMember,
threadMemberHasPermission, threadMemberHasPermission,
getContainingThreadID, getContainingThreadID,
} from './thread-utils.js'; } from './thread-utils.js';
import { import {
useSearchMessages as useSearchMessagesAction, useSearchMessages as useSearchMessagesAction,
searchMessagesActionTypes, searchMessagesActionTypes,
} from '../actions/message-actions.js'; } from '../actions/message-actions.js';
import { import {
searchUsers, searchUsers,
searchUsersActionTypes, searchUsersActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import genesis from '../facts/genesis.js'; import genesis from '../facts/genesis.js';
import type { import type {
ChatMessageInfoItem, ChatMessageInfoItem,
MessageListData, MessageListData,
ChatMessageItem,
} from '../selectors/chat-selectors.js'; } from '../selectors/chat-selectors.js';
import type { MessageInfo, RawMessageInfo } from '../types/message-types.js'; import type { MessageInfo, RawMessageInfo } from '../types/message-types.js';
import { isComposableMessageType } from '../types/message-types.js';
import type { MinimallyEncodedThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js'; import type { MinimallyEncodedThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
import { userRelationshipStatus } from '../types/relationship-types.js'; import { userRelationshipStatus } from '../types/relationship-types.js';
import { threadPermissions } from '../types/thread-permission-types.js'; import { threadPermissions } from '../types/thread-permission-types.js';
import { type ThreadType, threadTypes } from '../types/thread-types-enum.js'; import { type ThreadType, threadTypes } from '../types/thread-types-enum.js';
import { type ThreadInfo } from '../types/thread-types.js'; import { type ThreadInfo } from '../types/thread-types.js';
import type { import type {
AccountUserInfo, AccountUserInfo,
UserListItem, UserListItem,
▲ Show 20 Lines • Show All 97 Lines • ▼ Show 20 Linesfunction getPotentialMemberItems({
const blockedRelationshipsStatuses = new Set([ const blockedRelationshipsStatuses = new Set([
userRelationshipStatus.BLOCKED_BY_VIEWER, userRelationshipStatus.BLOCKED_BY_VIEWER,
userRelationshipStatus.BLOCKED_VIEWER, userRelationshipStatus.BLOCKED_VIEWER,
userRelationshipStatus.BOTH_BLOCKED, userRelationshipStatus.BOTH_BLOCKED,
]); ]);
let userResults = values(results); let userResults = values(results);
if (text === '') { if (text === '') {
userResults = userResults.filter(userInfo => userResults = userResults.filter(userInfo => {
containingThreadInfo if (!containingThreadInfo) {
? userInfo.isMemberOfContainingThread && return userInfo.relationshipStatus === userRelationshipStatus.FRIEND;
!blockedRelationshipsStatuses.has(userInfo.relationshipStatus) }
: userInfo?.relationshipStatus === userRelationshipStatus.FRIEND, if (!userInfo.isMemberOfContainingThread) {
); return false;
}
const { relationshipStatus } = userInfo;
if (!relationshipStatus) {
return true;
}
return !blockedRelationshipsStatuses.has(relationshipStatus);
});
} }
const nonFriends = []; const nonFriends = [];
const blockedUsers = []; const blockedUsers = [];
const friends = []; const friends = [];
const containingThreadMembers = []; const containingThreadMembers = [];
const parentThreadMembers = []; const parentThreadMembers = [];
for (const userResult of userResults) { for (const userResult of userResults) {
const relationshipStatus = userResult.relationshipStatus; const { relationshipStatus } = userResult;
if (blockedRelationshipsStatuses.has(relationshipStatus)) { if (
relationshipStatus &&
blockedRelationshipsStatuses.has(relationshipStatus)
) {
blockedUsers.push(userResult); blockedUsers.push(userResult);
} else if (userResult.isMemberOfParentThread) { } else if (userResult.isMemberOfParentThread) {
parentThreadMembers.push(userResult); parentThreadMembers.push(userResult);
} else if (userResult.isMemberOfContainingThread) { } else if (userResult.isMemberOfContainingThread) {
containingThreadMembers.push(userResult); containingThreadMembers.push(userResult);
} else if (relationshipStatus === userRelationshipStatus.FRIEND) { } else if (relationshipStatus === userRelationshipStatus.FRIEND) {
friends.push(userResult); friends.push(userResult);
} else { } else {
Show All 11 Lines return sortedResults.map(
({ ({
isMemberOfContainingThread, isMemberOfContainingThread,
isMemberOfParentThread, isMemberOfParentThread,
relationshipStatus, relationshipStatus,
...result ...result
}) => { }) => {
let notice, alert; let notice, alert;
const username = result.username; const username = result.username;
if (blockedRelationshipsStatuses.has(relationshipStatus)) { if (
relationshipStatus &&
blockedRelationshipsStatuses.has(relationshipStatus)
) {
notice = 'user is blocked'; notice = 'user is blocked';
alert = { alert = {
title: 'User is blocked', title: 'User is blocked',
text: text:
`Before you add ${username} to this chat, ` + `Before you add ${username} to this chat, ` +
'you’ll need to unblock them. You can do this from the Block List ' + 'you’ll need to unblock them. You can do this from the Block List ' +
'in the Profile tab.', 'in the Profile tab.',
}; };
▲ Show 20 Lines • Show All 114 Lines • ▼ Show 20 Lines
function filterChatMessageInfosForSearch( function filterChatMessageInfosForSearch(
chatMessageInfos: MessageListData, chatMessageInfos: MessageListData,
translatedSearchResults: $ReadOnlyArray<MessageInfo>, translatedSearchResults: $ReadOnlyArray<MessageInfo>,
): ?(ChatMessageInfoItem[]) { ): ?(ChatMessageInfoItem[]) {
if (!chatMessageInfos) { if (!chatMessageInfos) {
return null; return null;
} }
const idSet = new Set(translatedSearchResults.map(item => item.id)); const idSet = new Set(translatedSearchResults.map(messageID));
const chatMessageInfoItems = chatMessageInfos.filter(
item =>
item.messageInfo &&
idSet.has(item.messageInfo.id) &&
isComposableMessageType(item.messageInfo.type),
);
const uniqueChatMessageInfoItemsMap = new Map<string, ChatMessageItem>(); const uniqueChatMessageInfoItemsMap = new Map<string, ChatMessageInfoItem>();
chatMessageInfoItems.forEach( for (const item of chatMessageInfos) {
item => if (item.itemType !== 'message' || item.messageInfoType !== 'composable') {
item.messageInfo && continue;
item.messageInfo.id && }
uniqueChatMessageInfoItemsMap.set(item.messageInfo.id, item), const id = messageID(item.messageInfo);
); if (idSet.has(id)) {
uniqueChatMessageInfoItemsMap.set(id, item);
}
}
const sortedChatMessageInfoItems = []; const sortedChatMessageInfoItems: ChatMessageInfoItem[] = [];
for (let i = 0; i < translatedSearchResults.length; i++) { for (let i = 0; i < translatedSearchResults.length; i++) {
sortedChatMessageInfoItems.push( const id = messageID(translatedSearchResults[i]);
uniqueChatMessageInfoItemsMap.get(translatedSearchResults[i].id), const match = uniqueChatMessageInfoItemsMap.get(id);
); if (match) {
sortedChatMessageInfoItems.push(match);
} }
}
return sortedChatMessageInfoItems.filter(Boolean); return sortedChatMessageInfoItems;
} }
export { export {
getPotentialMemberItems, getPotentialMemberItems,
notFriendNotice, notFriendNotice,
useSearchMessages, useSearchMessages,
useSearchUsers, useSearchUsers,
filterChatMessageInfosForSearch, filterChatMessageInfosForSearch,
}; };
View Options

services/identity/src/error.rs

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { messageID } from './message-utils.js';
import SearchIndex from './search-index.js'; import SearchIndex from './search-index.js';
import { import {
userIsMember, userIsMember,
threadMemberHasPermission, threadMemberHasPermission,
getContainingThreadID, getContainingThreadID,
} from './thread-utils.js'; } from './thread-utils.js';
import { import {
useSearchMessages as useSearchMessagesAction, useSearchMessages as useSearchMessagesAction,
searchMessagesActionTypes, searchMessagesActionTypes,
} from '../actions/message-actions.js'; } from '../actions/message-actions.js';
import { import {
searchUsers, searchUsers,
searchUsersActionTypes, searchUsersActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import genesis from '../facts/genesis.js'; import genesis from '../facts/genesis.js';
import type { import type {
ChatMessageInfoItem, ChatMessageInfoItem,
MessageListData, MessageListData,
ChatMessageItem,
} from '../selectors/chat-selectors.js'; } from '../selectors/chat-selectors.js';
import type { MessageInfo, RawMessageInfo } from '../types/message-types.js'; import type { MessageInfo, RawMessageInfo } from '../types/message-types.js';
import { isComposableMessageType } from '../types/message-types.js';
import type { MinimallyEncodedThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js'; import type { MinimallyEncodedThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
import { userRelationshipStatus } from '../types/relationship-types.js'; import { userRelationshipStatus } from '../types/relationship-types.js';
import { threadPermissions } from '../types/thread-permission-types.js'; import { threadPermissions } from '../types/thread-permission-types.js';
import { type ThreadType, threadTypes } from '../types/thread-types-enum.js'; import { type ThreadType, threadTypes } from '../types/thread-types-enum.js';
import { type ThreadInfo } from '../types/thread-types.js'; import { type ThreadInfo } from '../types/thread-types.js';
import type { import type {
AccountUserInfo, AccountUserInfo,
UserListItem, UserListItem,
▲ Show 20 Lines • Show All 97 Lines • ▼ Show 20 Linesfunction getPotentialMemberItems({
const blockedRelationshipsStatuses = new Set([ const blockedRelationshipsStatuses = new Set([
userRelationshipStatus.BLOCKED_BY_VIEWER, userRelationshipStatus.BLOCKED_BY_VIEWER,
userRelationshipStatus.BLOCKED_VIEWER, userRelationshipStatus.BLOCKED_VIEWER,
userRelationshipStatus.BOTH_BLOCKED, userRelationshipStatus.BOTH_BLOCKED,
]); ]);
let userResults = values(results); let userResults = values(results);
if (text === '') { if (text === '') {
userResults = userResults.filter(userInfo => userResults = userResults.filter(userInfo => {
containingThreadInfo if (!containingThreadInfo) {
? userInfo.isMemberOfContainingThread && return userInfo.relationshipStatus === userRelationshipStatus.FRIEND;
!blockedRelationshipsStatuses.has(userInfo.relationshipStatus) }
: userInfo?.relationshipStatus === userRelationshipStatus.FRIEND, if (!userInfo.isMemberOfContainingThread) {
); return false;
}
const { relationshipStatus } = userInfo;
if (!relationshipStatus) {
return true;
}
return !blockedRelationshipsStatuses.has(relationshipStatus);
});
} }
const nonFriends = []; const nonFriends = [];
const blockedUsers = []; const blockedUsers = [];
const friends = []; const friends = [];
const containingThreadMembers = []; const containingThreadMembers = [];
const parentThreadMembers = []; const parentThreadMembers = [];
for (const userResult of userResults) { for (const userResult of userResults) {
const relationshipStatus = userResult.relationshipStatus; const { relationshipStatus } = userResult;
if (blockedRelationshipsStatuses.has(relationshipStatus)) { if (
relationshipStatus &&
blockedRelationshipsStatuses.has(relationshipStatus)
) {
blockedUsers.push(userResult); blockedUsers.push(userResult);
} else if (userResult.isMemberOfParentThread) { } else if (userResult.isMemberOfParentThread) {
parentThreadMembers.push(userResult); parentThreadMembers.push(userResult);
} else if (userResult.isMemberOfContainingThread) { } else if (userResult.isMemberOfContainingThread) {
containingThreadMembers.push(userResult); containingThreadMembers.push(userResult);
} else if (relationshipStatus === userRelationshipStatus.FRIEND) { } else if (relationshipStatus === userRelationshipStatus.FRIEND) {
friends.push(userResult); friends.push(userResult);
} else { } else {
Show All 11 Lines return sortedResults.map(
({ ({
isMemberOfContainingThread, isMemberOfContainingThread,
isMemberOfParentThread, isMemberOfParentThread,
relationshipStatus, relationshipStatus,
...result ...result
}) => { }) => {
let notice, alert; let notice, alert;
const username = result.username; const username = result.username;
if (blockedRelationshipsStatuses.has(relationshipStatus)) { if (
relationshipStatus &&
blockedRelationshipsStatuses.has(relationshipStatus)
) {
notice = 'user is blocked'; notice = 'user is blocked';
alert = { alert = {
title: 'User is blocked', title: 'User is blocked',
text: text:
`Before you add ${username} to this chat, ` + `Before you add ${username} to this chat, ` +
'you’ll need to unblock them. You can do this from the Block List ' + 'you’ll need to unblock them. You can do this from the Block List ' +
'in the Profile tab.', 'in the Profile tab.',
}; };
▲ Show 20 Lines • Show All 114 Lines • ▼ Show 20 Lines
function filterChatMessageInfosForSearch( function filterChatMessageInfosForSearch(
chatMessageInfos: MessageListData, chatMessageInfos: MessageListData,
translatedSearchResults: $ReadOnlyArray<MessageInfo>, translatedSearchResults: $ReadOnlyArray<MessageInfo>,
): ?(ChatMessageInfoItem[]) { ): ?(ChatMessageInfoItem[]) {
if (!chatMessageInfos) { if (!chatMessageInfos) {
return null; return null;
} }
const idSet = new Set(translatedSearchResults.map(item => item.id)); const idSet = new Set(translatedSearchResults.map(messageID));
const chatMessageInfoItems = chatMessageInfos.filter(
item =>
item.messageInfo &&
idSet.has(item.messageInfo.id) &&
isComposableMessageType(item.messageInfo.type),
);
const uniqueChatMessageInfoItemsMap = new Map<string, ChatMessageItem>(); const uniqueChatMessageInfoItemsMap = new Map<string, ChatMessageInfoItem>();
chatMessageInfoItems.forEach( for (const item of chatMessageInfos) {
item => if (item.itemType !== 'message' || item.messageInfoType !== 'composable') {
item.messageInfo && continue;
item.messageInfo.id && }
uniqueChatMessageInfoItemsMap.set(item.messageInfo.id, item), const id = messageID(item.messageInfo);
); if (idSet.has(id)) {
uniqueChatMessageInfoItemsMap.set(id, item);
}
}
const sortedChatMessageInfoItems = []; const sortedChatMessageInfoItems: ChatMessageInfoItem[] = [];
for (let i = 0; i < translatedSearchResults.length; i++) { for (let i = 0; i < translatedSearchResults.length; i++) {
sortedChatMessageInfoItems.push( const id = messageID(translatedSearchResults[i]);
uniqueChatMessageInfoItemsMap.get(translatedSearchResults[i].id), const match = uniqueChatMessageInfoItemsMap.get(id);
); if (match) {
sortedChatMessageInfoItems.push(match);
} }
}
return sortedChatMessageInfoItems.filter(Boolean); return sortedChatMessageInfoItems;
} }
export { export {
getPotentialMemberItems, getPotentialMemberItems,
notFriendNotice, notFriendNotice,
useSearchMessages, useSearchMessages,
useSearchUsers, useSearchUsers,
filterChatMessageInfosForSearch, filterChatMessageInfosForSearch,
}; };