mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-01-13 22:29:26 -05:00
dedup events: state events conflict with messages events. Do not consider them in deduplication
This commit is contained in:
parent
b099634ba1
commit
130cbdd7af
@ -202,14 +202,16 @@ angular.module('eventHandlerService', [])
|
|||||||
// AND from the event stream.
|
// AND from the event stream.
|
||||||
// FIXME: This workaround should be no more required when /initialSync on a particular room
|
// FIXME: This workaround should be no more required when /initialSync on a particular room
|
||||||
// will be available (as opposite to the global /initialSync done at startup)
|
// will be available (as opposite to the global /initialSync done at startup)
|
||||||
if (event.event_id && eventMap[event.event_id]) {
|
if (!isStateEvent) { // Do not consider state events
|
||||||
console.log("discarding duplicate event: " + JSON.stringify(event, undefined, 4));
|
if (event.event_id && eventMap[event.event_id]) {
|
||||||
return;
|
console.log("discarding duplicate event: " + JSON.stringify(event, undefined, 4));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
eventMap[event.event_id] = 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
eventMap[event.event_id] = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (event.type.indexOf('m.call.') === 0) {
|
if (event.type.indexOf('m.call.') === 0) {
|
||||||
handleCallEvent(event, isLiveEvent);
|
handleCallEvent(event, isLiveEvent);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user