MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2025-02-18 09:40:12 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️ Consider these not-errors to allow for forward-compat/reuse.

Browse source
This commit is contained in:
Jason Volk 2018-02-27 20:25:23 -08:00
parent 03034723df
commit bd4da0dd0a
2 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/ircd/m/event.h
View file

@ -165,10 +165,8 @@ enum ircd::m::event::conforms::code
MISSING_ORIGIN, ///< origin empty
INVALID_ORIGIN, ///< origin not a proper domain
INVALID_OR_MISSING_REDACTS_ID, ///< for m.room.redaction
USELESS_REDACTS_ID, ///< redacts present in non-m.room.redaction
MISSING_MEMBERSHIP, ///< for m.room.member, membership empty
INVALID_MEMBERSHIP, ///< for m.room.member (does not check actual states)
USELESS_MEMBERSHIP, ///< membership present in non-m.room.member
MISSING_CONTENT_MEMBERSHIP, ///< for m.room.member, content.membership
INVALID_CONTENT_MEMBERSHIP, ///< for m.room.member, content.membership
MISSING_PREV_EVENTS, ///< for non-m.room.create, empty prev_events

10
ircd/m/event.cc
View file

@ -522,10 +522,8 @@ ircd::m::event_conforms_reflects
"MISSING_ORIGIN",
"INVALID_ORIGIN",
"INVALID_OR_MISSING_REDACTS_ID",
"USELESS_REDACTS_ID",
"MISSING_MEMBERSHIP",
"INVALID_MEMBERSHIP",
"USELESS_MEMBERSHIP",
"MISSING_CONTENT_MEMBERSHIP",
"INVALID_CONTENT_MEMBERSHIP",
"MISSING_PREV_EVENTS",
@ -603,10 +601,6 @@ ircd::m::event::conforms::conforms(const event &e)
if(!valid(m::id::EVENT, json::get<"redacts"_>(e)))
set(INVALID_OR_MISSING_REDACTS_ID);
if(json::get<"type"_>(e) != "m.room.redaction")
if(!empty(json::get<"redacts"_>(e)))
set(USELESS_REDACTS_ID);
if(json::get<"type"_>(e) == "m.room.member")
if(empty(json::get<"membership"_>(e)))
set(MISSING_MEMBERSHIP);
@ -615,10 +609,6 @@ ircd::m::event::conforms::conforms(const event &e)
if(!all_of<std::islower>(json::get<"membership"_>(e)))
set(INVALID_MEMBERSHIP);
if(json::get<"type"_>(e) != "m.room.member")
if(!empty(json::get<"membership"_>(e)))
set(USELESS_MEMBERSHIP);
if(json::get<"type"_>(e) == "m.room.member")
if(empty(unquote(json::get<"content"_>(e).get("membership"))))
set(MISSING_CONTENT_MEMBERSHIP);