fix: renamed StoreUserInitiatedMessage to subrequest

pull/3281/head
Audric Ackermann 10 months ago
parent e697387932
commit 69f4a06d2e
No known key found for this signature in database

@ -1385,14 +1385,20 @@ export type BatchStoreWithExtraParams =
| SubaccountRevokeSubRequest
| SubaccountUnrevokeSubRequest;
export type StoreUserInitiatedMessage =
/**
* A `StoreUserInitiatedSubRequest` is a request that the user made and that (potentially) has
* a corresponding message in the database.
* Those messages are the messages that display a failed/sent status, so we need to update them when the request is done, to reflect the
* success/failure of the sending step.
*/
export type StoreUserInitiatedSubRequest =
| StoreGroupMessageSubRequest
| StoreLegacyGroupMessageSubRequest
| StoreUserMessageSubRequest;
export function isStoreUserInitiatedMessage(
export function isStoreUserInitiatedSubRequest(
request: SnodeAPISubRequest<string>
): request is StoreUserInitiatedMessage {
): request is StoreUserInitiatedSubRequest {
return (
request instanceof StoreGroupMessageSubRequest ||
request instanceof StoreLegacyGroupMessageSubRequest ||

@ -16,7 +16,7 @@ import {
DeleteAllFromGroupMsgNodeSubRequest,
DeleteHashesFromGroupNodeSubRequest,
DeleteHashesFromUserNodeSubRequest,
isStoreUserInitiatedMessage,
isStoreUserInitiatedSubRequest,
MethodBatchType,
RawSnodeSubRequests,
StoreGroupInfoSubRequest,
@ -560,7 +560,9 @@ async function sendEncryptedDataToSnode<T extends GroupPubkeyType | PubkeyType>(
return batchResults;
} catch (e) {
window.log.warn(`sendEncryptedDataToSnode failed with ${e.message}`);
const sortedSubRequestsWithMsg = sortedSubRequests.filter(r => isStoreUserInitiatedMessage(r));
const sortedSubRequestsWithMsg = sortedSubRequests.filter(r =>
isStoreUserInitiatedSubRequest(r)
);
for (let index = 0; index < sortedSubRequestsWithMsg.length; index++) {
const request = sortedSubRequestsWithMsg[index];
if (request.dbMessageIdentifier) {
@ -673,7 +675,7 @@ async function handleBatchResultWithSubRequests({
// there are some things we need to do when storing messages
// for groups/legacy groups or user (but not for config messages)
if (isStoreUserInitiatedMessage(subRequest)) {
if (isStoreUserInitiatedSubRequest(subRequest)) {
const storedAt = batchResult?.[index]?.body?.t;
const storedHash = batchResult?.[index]?.body?.hash;
const subRequestStatusCode = batchResult?.[index]?.code;

Loading…
Cancel
Save