mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Refactor SendMessage.ts to named parameters

Browse source
This commit is contained in:
Scott Nonnenberg 2021-07-02 11:34:17 -07:00 • committed by GitHub
parent 56933192ba
commit 615ae1ccf7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 540 additions and 470 deletions
Download patch file Download diff file Expand all files Collapse all files

48
ts/groups.ts
View file

@ -1298,8 +1298,8 @@ export async function modifyGroupV2({
const { ContentHint } = Proto.UnidentifiedSenderMessage.Message;
const promise = handleMessageSend(
window.Signal.Util.sendToGroup(
{
window.Signal.Util.sendToGroup({
groupSendOptions: {
groupV2: conversation.getGroupV2Info({
groupChange: typedArrayToArrayBuffer(groupChangeBuffer),
includePendingMembers: true,
@ -1309,9 +1309,9 @@ export async function modifyGroupV2({
profileKey,
},
conversation,
ContentHint.DEFAULT,
sendOptions
)
contentHint: ContentHint.DEFAULT,
sendOptions,
})
);
// We don't save this message; we just use it to ensure that a sync message is
@ -1676,16 +1676,16 @@ export async function createGroupV2({
conversation,
logId: `sendToGroup/${logId}`,
send: async () =>
window.Signal.Util.sendToGroup(
{
window.Signal.Util.sendToGroup({
groupSendOptions: {
groupV2: groupV2Info,
timestamp,
profileKey,
},
conversation,
ContentHint.DEFAULT,
sendOptions
),
contentHint: ContentHint.DEFAULT,
sendOptions,
}),
timestamp,
});
@ -2207,8 +2207,8 @@ export async function initiateMigrationToGroupV2(
logId: `sendToGroup/${logId}`,
send: async () =>
// Minimal message to notify group members about migration
window.Signal.Util.sendToGroup(
{
window.Signal.Util.sendToGroup({
groupSendOptions: {
groupV2: conversation.getGroupV2Info({
includePendingMembers: true,
}),
@ -2216,9 +2216,9 @@ export async function initiateMigrationToGroupV2(
profileKey: ourProfileKey,
},
conversation,
ContentHint.DEFAULT,
sendOptions
),
contentHint: ContentHint.DEFAULT,
sendOptions,
}),
timestamp,
});
}
@ -2278,17 +2278,15 @@ export async function wrapWithSyncMessageSend({
);
}
await sender.sendSyncMessage(
dataMessage,
await sender.sendSyncMessage({
encodedDataMessage: dataMessage,
timestamp,
ourConversation.get('e164'),
ourConversation.get('uuid'),
null, // expirationStartTimestamp
[], // sentTo
[], // unidentifiedDeliveries
undefined, // isUpdate
undefined // options
);
destination: ourConversation.get('e164'),
destinationUuid: ourConversation.get('uuid'),
expirationStartTimestamp: null,
sentTo: [],
unidentifiedDeliveries: [],
});
}
export async function waitThenRespondToGroupV2Migration(