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

A couple of small bugfixes

Browse source
This commit is contained in:
Scott Nonnenberg 2020-09-10 13:06:26 -07:00 committed by GitHub
parent 4c98b4a96f
commit deb3dd5d4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ts/groups.ts
View file

@ -1425,8 +1425,7 @@ async function applyGroupChange({
if (actions.modifyMemberAccess) { if (actions.modifyMemberAccess) {
result.accessControl = { result.accessControl = {
...result.accessControl, ...result.accessControl,
attributes: members: actions.modifyMemberAccess.membersAccess || ACCESS_ENUM.MEMBER,
actions.modifyMemberAccess.membersAccess || ACCESS_ENUM.MEMBER,
}; };
} }

7
ts/textsecure/MessageReceiver.ts
View file

@ -1344,15 +1344,18 @@ class MessageReceiverInner extends EventTarget {
ev.sender = envelope.source; ev.sender = envelope.source;
ev.senderUuid = envelope.sourceUuid; ev.senderUuid = envelope.sourceUuid;
ev.senderDevice = envelope.sourceDevice; ev.senderDevice = envelope.sourceDevice;
const groupIdBuffer = groupId ? groupId.toArrayBuffer() : null;
ev.typing = { ev.typing = {
typingMessage, typingMessage,
timestamp: timestamp ? timestamp.toNumber() : Date.now(), timestamp: timestamp ? timestamp.toNumber() : Date.now(),
groupId: groupId:
groupId && groupId.buffer.byteLength < 45 groupIdBuffer && groupIdBuffer.byteLength <= 16
? groupId.toString('binary') ? groupId.toString('binary')
: null, : null,
groupV2Id: groupV2Id:
groupId && groupId.buffer.byteLength >= 45 groupIdBuffer && groupIdBuffer.byteLength > 16
? groupId.toString('base64') ? groupId.toString('base64')
: null, : null,
started: started: