MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-05-29 00:03:45 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️ Minor cleanup.

Browse source
This commit is contained in:
Jason Volk 2018-03-28 13:05:15 -07:00
parent f07eed2ab9
commit 43b92dc95d
2 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/ircd/m/m.h
View file

@ -14,17 +14,12 @@
/// Matrix Protocol System
namespace ircd::m
{
using ircd::hash;
struct init;
extern struct user me;
extern struct room my_room;
extern struct node my_node;
extern struct room control;
extern struct log::log log;
extern std::list<ircd::net::listener> listeners;
using ircd::hash;
IRCD_OVERLOAD(generate)
}
@ -36,6 +31,11 @@ namespace ircd::m::self
namespace ircd::m
{
extern struct user me;
extern struct room my_room;
extern struct node my_node;
extern struct room control;
inline string_view my_host() { return self::host(); }
inline bool my_host(const string_view &h) { return self::host(h); }
}

29
ircd/m/m.cc
View file

@ -12,18 +12,20 @@
namespace ircd::m
{
struct log::log log
{
"matrix", 'm'
};
std::map<std::string, ircd::module> modules;
std::list<ircd::net::listener> listeners;
static void leave_ircd_room();
static void join_ircd_room();
}
decltype(ircd::m::log)
ircd::m::log
{
"matrix", 'm'
};
decltype(ircd::m::listeners)
ircd::m::listeners
{};
//
// my user
//
@ -1419,6 +1421,8 @@ ircd::m::txn::create(const array &pdu,
const array &edu,
const array &pdu_failure)
{
using ircd::size;
json::iov iov;
const json::iov::push push[]
{
@ -1871,6 +1875,15 @@ ircd::m::hook::list::add(site &site)
return true;
}
///////////////////////////////////////////////////////////////////////////////
//
// m/import.h
//
decltype(ircd::m::modules)
ircd::m::modules
{};
///////////////////////////////////////////////////////////////////////////////
//
// m/error.h