mirror of
https://github.com/signalapp/Signal-Desktop.git
synced 2025-12-26 05:08:06 +00:00
handleBlocked: Continue on if we receive non-ACI
This commit is contained in:
@@ -3881,9 +3881,19 @@ export default class MessageReceiver
|
||||
}
|
||||
if (blocked.acis) {
|
||||
const previous = this.storage.get('blocked-uuids', []);
|
||||
const acis = blocked.acis.map((aci, index) => {
|
||||
return normalizeAci(aci, `handleBlocked.acis.${index}`);
|
||||
});
|
||||
const acis = blocked.acis
|
||||
.map((aci, index) => {
|
||||
try {
|
||||
return normalizeAci(aci, `handleBlocked.acis.${index}`);
|
||||
} catch (error) {
|
||||
log.warn(
|
||||
`${logId}: ACI ${aci} was malformed`,
|
||||
Errors.toLogFormat(error)
|
||||
);
|
||||
return undefined;
|
||||
}
|
||||
})
|
||||
.filter(isNotNil);
|
||||
|
||||
const { added, removed } = diffArraysAsSets(previous, acis);
|
||||
if (added.length) {
|
||||
|
||||
@@ -29,7 +29,10 @@ export function normalizeAci(
|
||||
}
|
||||
|
||||
const result = rawAci.toLowerCase();
|
||||
strictAssert(!result.startsWith('pni:'), 'ACI should not start with PNI:');
|
||||
strictAssert(
|
||||
!result.startsWith('pni:'),
|
||||
`ACI should not start with 'PNI:' in ${context}`
|
||||
);
|
||||
|
||||
if (!isAciString(result)) {
|
||||
logger.warn(
|
||||
|
||||
Reference in New Issue
Block a user