MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-28 00:14:07 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:user: Combine user.h and user/user.h like other directories.

Browse source
This commit is contained in:
Jason Volk 2019-07-11 12:57:11 -07:00
parent 6032331bf2
commit 7fdf87a21f
3 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,7 @@ namespace ircd::m
#include "invite_3pid.h"
#include "createroom.h"
#include "room/room.h"
#include "user.h"
#include "user/user.h"
#include "users.h"
#include "rooms.h"
#include "filter.h"

36
include/ircd/m/user.h
View file

@ -1,36 +0,0 @@
// 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_USER_H
namespace ircd::m
{
struct user;
bool my(const user &);
bool exists(const user &);
bool exists(const id::user &);
user create(const id::user &, const json::members &args = {});
}
#include "user/user.h"
#include "user/room.h"
#include "user/rooms.h"
#include "user/mitsein.h"
#include "user/events.h"
#include "user/profile.h"
#include "user/account_data.h"
#include "user/room_account_data.h"
#include "user/room_tags.h"
#include "user/filter.h"
#include "user/ignores.h"
#include "user/highlight.h"

29
include/ircd/m/user/user.h
View file

@ -11,6 +11,23 @@
#pragma once
#define HAVE_IRCD_M_USER_USER_H
namespace ircd::m
{
struct user;
bool my(const user &);
bool exists(const user &);
bool exists(const id::user &);
user create(const id::user &, const json::members &args = {});
}
/// This lightweight object is the strong type for a user.
///
/// Instances of this object are used as an argument in many places. The
/// sub-objects form special interfaces for the core tools and features
/// related to users. Not all user-related features are nested here,
/// only fundamentals which are generally used further by other features.
struct ircd::m::user
{
struct room;
@ -62,3 +79,15 @@ const
{
return user_id;
}
#include "room.h"
#include "rooms.h"
#include "mitsein.h"
#include "events.h"
#include "profile.h"
#include "account_data.h"
#include "room_account_data.h"
#include "room_tags.h"
#include "filter.h"
#include "ignores.h"
#include "highlight.h"