From d2f887f77881a0f9a5aba8d1a455e4aae99bf3ed Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Tue, 23 Jan 2018 15:04:18 -0800 Subject: [PATCH] ircd::m: Move m.room keys to name.h --- include/ircd/m/name.h | 18 ++++++++++++++++++ include/ircd/m/room.h | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/ircd/m/name.h b/include/ircd/m/name.h index 13b91f2e7..859150cec 100644 --- a/include/ircd/m/name.h +++ b/include/ircd/m/name.h @@ -43,3 +43,21 @@ namespace ircd::m::name constexpr const char *const valid_until_ts {"valid_until_ts"}; constexpr const char *const verify_keys {"verify_keys"}; } + +namespace ircd::m::name +{ + constexpr const char *const m_room_aliases {"m.room.aliases"}; + constexpr const char *const m_room_canonical_alias {"m.room.canonical_alias"}; + constexpr const char *const m_room_create {"m.room.create"}; + constexpr const char *const m_room_join_rules {"m.room.join_rules"}; + constexpr const char *const m_room_member {"m.room.member"}; + constexpr const char *const m_room_power_levels {"m.room.power_levels"}; + constexpr const char *const m_room_message {"m.room.message"}; + constexpr const char *const m_room_name {"m.room.name"}; + constexpr const char *const m_room_topic {"m.room.topic"}; + constexpr const char *const m_room_avatar {"m.room.avatar"}; + constexpr const char *const m_room_pinned_events {"m.room.pinned_events"}; + constexpr const char *const m_room_history_visibility {"m.room.history_visibility"}; + constexpr const char *const m_room_third_party_invite {"m.room.third_party_invite"}; + constexpr const char *const m_room_guest_access {"m.room.guest_access"}; +} diff --git a/include/ircd/m/room.h b/include/ircd/m/room.h index 6c20ebdb6..081801569 100644 --- a/include/ircd/m/room.h +++ b/include/ircd/m/room.h @@ -156,24 +156,6 @@ struct ircd::m::room::members::origins {} }; -namespace ircd::m::name -{ - constexpr const char *const m_room_aliases {"m.room.aliases"}; - constexpr const char *const m_room_canonical_alias {"m.room.canonical_alias"}; - constexpr const char *const m_room_create {"m.room.create"}; - constexpr const char *const m_room_join_rules {"m.room.join_rules"}; - constexpr const char *const m_room_member {"m.room.member"}; - constexpr const char *const m_room_power_levels {"m.room.power_levels"}; - constexpr const char *const m_room_message {"m.room.message"}; - constexpr const char *const m_room_name {"m.room.name"}; - constexpr const char *const m_room_topic {"m.room.topic"}; - constexpr const char *const m_room_avatar {"m.room.avatar"}; - constexpr const char *const m_room_pinned_events {"m.room.pinned_events"}; - constexpr const char *const m_room_history_visibility {"m.room.history_visibility"}; - constexpr const char *const m_room_third_party_invite {"m.room.third_party_invite"}; - constexpr const char *const m_room_guest_access {"m.room.guest_access"}; -} - /// Tuple to represent fundamental room state singletons (state_key = "") /// /// This is not a complete representation of room state. Missing from here