PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #4447 from matrix-org/t3chguy/poljar/cherry-pick1

Browse source 
EventIndex: Filter out events that don't have a propper content value.
This commit is contained in:
J. Ryan Stinnett 2020-04-20 10:09:26 +01:00 committed by GitHub
commit 54c1ae8322
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/indexing/EventIndex.js
View file

@ -275,6 +275,7 @@ export default class EventIndex extends EventEmitter {
const validEventType = isUsefulType && !ev.isRedacted() && !ev.isDecryptionFailure();
let validMsgType = true;
let hasContentValue = true;
if (ev.getType() === "m.room.message" && !ev.isRedacted()) {
// Expand this if there are more invalid msgtypes.
@ -282,9 +283,15 @@ export default class EventIndex extends EventEmitter {
if (!msgtype) validMsgType = false;
else validMsgType = !msgtype.startsWith("m.key.verification");
if (!ev.getContent().body) hasContentValue = false;
} else if (ev.getType() === "m.room.topic" && !ev.isRedacted()) {
if (!ev.getContent().topic) hasContentValue = false;
} else if (ev.getType() === "m.room.name" && !ev.isRedacted()) {
if (!ev.getContent().name) hasContentValue = false;
}
return validEventType && validMsgType;
return validEventType && validMsgType && hasContentValue;
}
/**