forked from MirrorHub/synapse
dedup events: state events conflict with messages events. Do not consider them in deduplication
This commit is contained in:
parent
b099634ba1
commit
130cbdd7af
1 changed files with 9 additions and 7 deletions
|
@ -202,12 +202,14 @@ angular.module('eventHandlerService', [])
|
|||
// AND from the event stream.
|
||||
// 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)
|
||||
if (event.event_id && eventMap[event.event_id]) {
|
||||
console.log("discarding duplicate event: " + JSON.stringify(event, undefined, 4));
|
||||
return;
|
||||
}
|
||||
else {
|
||||
eventMap[event.event_id] = 1;
|
||||
if (!isStateEvent) { // Do not consider state events
|
||||
if (event.event_id && eventMap[event.event_id]) {
|
||||
console.log("discarding duplicate event: " + JSON.stringify(event, undefined, 4));
|
||||
return;
|
||||
}
|
||||
else {
|
||||
eventMap[event.event_id] = 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (event.type.indexOf('m.call.') === 0) {
|
||||
|
|
Loading…
Reference in a new issue