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

Use untagged pnis in storage service

Browse source
This commit is contained in:
Fedor Indutny 2023-09-28 01:14:55 +02:00 • committed by GitHub
parent 283ef57779
commit eb7942dd1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 530 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ts/textsecure/MessageReceiver.ts
View file

@ -59,8 +59,10 @@ import {
normalizeServiceId,
normalizePni,
isPniString,
isUntaggedPniString,
isServiceIdString,
fromPniObject,
toTaggedPni,
} from '../types/ServiceId';
import { normalizeAci } from '../util/normalizeAci';
import { isAciString } from '../util/isAciString';
@ -421,12 +423,13 @@ export default class MessageReceiver
'MessageReceiver.handleRequest.destinationServiceId'
)
: ourAci,
updatedPni: decoded.updatedPni
? normalizePni(
decoded.updatedPni,
'MessageReceiver.handleRequest.updatedPni'
)
: undefined,
updatedPni:
decoded.updatedPni && isUntaggedPniString(decoded.updatedPni)
? normalizePni(
toTaggedPni(decoded.updatedPni),
'MessageReceiver.handleRequest.updatedPni'
)
: undefined,
timestamp: decoded.timestamp?.toNumber(),
content: dropNull(decoded.content),
serverGuid: decoded.serverGuid,
@ -878,8 +881,11 @@ export default class MessageReceiver
decoded.destinationServiceId || item.destinationServiceId || ourAci,
'CachedEnvelope.destinationServiceId'
),
updatedPni: decoded.updatedPni
? normalizePni(decoded.updatedPni, 'CachedEnvelope.updatedPni')
updatedPni: isUntaggedPniString(decoded.updatedPni)
? normalizePni(
toTaggedPni(decoded.updatedPni),
'CachedEnvelope.updatedPni'
)
: undefined,
timestamp: decoded.timestamp?.toNumber(),
content: dropNull(decoded.content),