mirror of
https://github.com/matrix-construct/construct
synced 2024-12-27 07:54:05 +01:00
ircd:Ⓜ️ Reorg event / room include related.
This commit is contained in:
Jason Volk
parent
5e41ece0e3
commit
24e031a810
4 changed files with 72 additions and 57 deletions
63
include/ircd/m/event.h
Normal file
63
include/ircd/m/event.h
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
// Matrix Construct
|
||||
//
|
||||
// Copyright (C) Matrix Construct Developers, Authors & Contributors
|
||||
// Copyright (C) 2016-2018 Jason Volk <jason@zemos.net>
|
||||
//
|
||||
// Permission to use, copy, modify, and/or distribute this software for any
|
||||
// purpose with or without fee is hereby granted, provided that the above
|
||||
// copyright notice and this permission notice is present in all copies. The
|
||||
// full license for this software is available in the LICENSE file.
|
||||
|
||||
#pragma once
|
||||
#define HAVE_IRCD_M_EVENT_H
|
||||
|
||||
namespace ircd::m
|
||||
{
|
||||
struct event;
|
||||
|
||||
// General util
|
||||
bool my(const id::event &);
|
||||
bool my(const event &);
|
||||
size_t degree(const event &);
|
||||
string_view membership(const event &);
|
||||
bool check_size(std::nothrow_t, const event &);
|
||||
void check_size(const event &);
|
||||
|
||||
// [GET]
|
||||
bool exists(const id::event &);
|
||||
bool exists(const id::event &, const bool &good);
|
||||
bool good(const id::event &);
|
||||
bool bad(const id::event &);
|
||||
|
||||
// Equality tests the event_id only! know this.
|
||||
bool operator==(const event &a, const event &b);
|
||||
|
||||
// Depth comparison; expect unstable sorting.
|
||||
bool operator<(const event &, const event &);
|
||||
bool operator>(const event &, const event &);
|
||||
bool operator<=(const event &, const event &);
|
||||
bool operator>=(const event &, const event &);
|
||||
|
||||
// Topological
|
||||
bool before(const event &a, const event &b); // A directly referenced by B
|
||||
|
||||
id::event make_id(const event &, id::event::buf &buf, const const_buffer &hash);
|
||||
id::event make_id(const event &, id::event::buf &buf);
|
||||
|
||||
// Informational pretty string condensed to single line.
|
||||
std::ostream &pretty_oneline(std::ostream &, const event &, const bool &content_keys = true);
|
||||
std::string pretty_oneline(const event &, const bool &content_keys = true);
|
||||
|
||||
// Informational pretty string on multiple lines.
|
||||
std::ostream &pretty(std::ostream &, const event &);
|
||||
std::string pretty(const event &);
|
||||
|
||||
// Informational content-oriented
|
||||
std::ostream &pretty_msgline(std::ostream &, const event &);
|
||||
std::string pretty_msgline(const event &);
|
||||
}
|
||||
|
||||
#include "event/event.h"
|
||||
#include "event/prev.h"
|
||||
#include "event/fetch.h"
|
||||
#include "event/conforms.h"
|
||||
|
|
@ -11,52 +11,6 @@
|
|||
#pragma once
|
||||
#define HAVE_IRCD_M_EVENT_EVENT_H
|
||||
|
||||
namespace ircd::m
|
||||
{
|
||||
struct event;
|
||||
|
||||
// General util
|
||||
bool my(const id::event &);
|
||||
bool my(const event &);
|
||||
size_t degree(const event &);
|
||||
string_view membership(const event &);
|
||||
bool check_size(std::nothrow_t, const event &);
|
||||
void check_size(const event &);
|
||||
|
||||
// [GET]
|
||||
bool exists(const id::event &);
|
||||
bool exists(const id::event &, const bool &good);
|
||||
bool good(const id::event &);
|
||||
bool bad(const id::event &);
|
||||
|
||||
// Equality tests the event_id only! know this.
|
||||
bool operator==(const event &a, const event &b);
|
||||
|
||||
// Depth comparison; expect unstable sorting.
|
||||
bool operator<(const event &, const event &);
|
||||
bool operator>(const event &, const event &);
|
||||
bool operator<=(const event &, const event &);
|
||||
bool operator>=(const event &, const event &);
|
||||
|
||||
// Topological
|
||||
bool before(const event &a, const event &b); // A directly referenced by B
|
||||
|
||||
id::event make_id(const event &, id::event::buf &buf, const const_buffer &hash);
|
||||
id::event make_id(const event &, id::event::buf &buf);
|
||||
|
||||
// Informational pretty string condensed to single line.
|
||||
std::ostream &pretty_oneline(std::ostream &, const event &, const bool &content_keys = true);
|
||||
std::string pretty_oneline(const event &, const bool &content_keys = true);
|
||||
|
||||
// Informational pretty string on multiple lines.
|
||||
std::ostream &pretty(std::ostream &, const event &);
|
||||
std::string pretty(const event &);
|
||||
|
||||
// Informational content-oriented
|
||||
std::ostream &pretty_msgline(std::ostream &, const event &);
|
||||
std::string pretty_msgline(const event &);
|
||||
}
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wsubobject-linkage"
|
||||
/// The Main Event
|
||||
|
|
|
|||
|
|
@ -32,21 +32,11 @@ namespace ircd::m::vm
|
|||
#include "error.h"
|
||||
#include "self.h"
|
||||
#include "id.h"
|
||||
#include "event/event.h"
|
||||
#include "event/prev.h"
|
||||
#include "event/fetch.h"
|
||||
#include "event/conforms.h"
|
||||
#include "event.h"
|
||||
#include "dbs.h"
|
||||
#include "state.h"
|
||||
#include "vm.h"
|
||||
#include "room.h"
|
||||
#include "room/room.h"
|
||||
#include "room/messages.h"
|
||||
#include "room/state.h"
|
||||
#include "room/members.h"
|
||||
#include "room/origins.h"
|
||||
#include "room/head.h"
|
||||
#include "room/power.h"
|
||||
#include "user.h"
|
||||
#include "users.h"
|
||||
#include "rooms.h"
|
||||
|
|
|
|||
|
|
@ -66,3 +66,11 @@ namespace ircd::m
|
|||
room create(const id::room &, const id::user &creator, const id::room &parent, const string_view &type);
|
||||
room create(const id::room &, const id::user &creator, const string_view &type = {});
|
||||
}
|
||||
|
||||
#include "room/room.h"
|
||||
#include "room/messages.h"
|
||||
#include "room/state.h"
|
||||
#include "room/members.h"
|
||||
#include "room/origins.h"
|
||||
#include "room/head.h"
|
||||
#include "room/power.h"
|
||||
|
|
|
|||
Loading…
Reference in a new issue