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

modules: Split out client/user related interface impls.

Browse source
This commit is contained in:
Jason Volk 2019-08-25 18:56:11 -07:00
parent 8a860b61ce
commit f298e95373
7 changed files with 451 additions and 396 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ircd/m.cc
View file

@ -209,6 +209,9 @@ ircd::m::module_names
"m_user_events",
"m_user_highlight",
"m_user_profile",
"m_user_account_data",
"m_user_room_account_data",
"m_user_room_tags",
"m_room",
"m_room_auth",
"m_room_head",

6
modules/Makefile.am
View file

@ -110,6 +110,9 @@ m_user_mitsein_la_SOURCES = m_user_mitsein.cc
m_user_servers_la_SOURCES = m_user_servers.cc
m_user_highlight_la_SOURCES = m_user_highlight.cc
m_user_profile_la_SOURCES = m_user_profile.cc
m_user_account_data_la_SOURCES = m_user_account_data.cc
m_user_room_account_data_la_SOURCES = m_user_room_account_data.cc
m_user_room_tags_la_SOURCES = m_user_room_tags.cc
m_node_la_SOURCES = m_node.cc
m_keys_la_SOURCES = m_keys.cc
m_feds_la_SOURCES = m_feds.cc
@ -165,6 +168,9 @@ m_module_LTLIBRARIES = \
m_user_servers.la \
m_user_highlight.la \
m_user_profile.la \
m_user_account_data.la \
m_user_room_account_data.la \
m_user_room_tags.la \
m_node.la \
m_keys.la \
m_feds.la \

98
modules/client/user/account_data.cc
View file

@ -73,101 +73,3 @@ get__account_data(client &client,
return {}; // responded from closure
}
ircd::m::event::id::buf
IRCD_MODULE_EXPORT
ircd::m::user::account_data::set(const string_view &type,
const json::object &value)
const
{
const m::user::room user_room
{
user
};
return send(user_room, user, "ircd.account_data", type, value);
}
ircd::json::object
IRCD_MODULE_EXPORT
ircd::m::user::account_data::get(const mutable_buffer &out,
const string_view &type)
const
{
json::object ret;
get(std::nothrow, type, [&out, &ret]
(const string_view &type, const json::object &val)
{
ret = string_view { data(out), copy(out, val) };
});
return ret;
}
void
ircd::m::user::account_data::get(const string_view &type,
const closure &closure)
const
{
if(!get(std::nothrow, type, closure))
throw m::NOT_FOUND
{
"account data type '%s' for user %s not found",
type,
string_view{user.user_id}
};
}
bool
IRCD_MODULE_EXPORT
ircd::m::user::account_data::get(std::nothrow_t,
const string_view &type,
const closure &closure)
const
{
const user::room user_room{user};
const room::state state{user_room};
const event::idx &event_idx
{
state.get(std::nothrow, "ircd.account_data", type)
};
return event_idx && m::get(std::nothrow, event_idx, "content", [&type, &closure]
(const json::object &content)
{
closure(type, content);
});
}
bool
IRCD_MODULE_EXPORT
ircd::m::user::account_data::for_each(const closure_bool &closure)
const
{
static const event::fetch::opts fopts
{
event::keys::include {"state_key", "content"}
};
const user::room user_room{user};
const room::state state
{
user_room, &fopts
};
return state.for_each("ircd.account_data", event::closure_bool{[&closure]
(const m::event &event)
{
const auto &key
{
at<"state_key"_>(event)
};
const auto &val
{
json::get<"content"_>(event)
};
return closure(key, val);
}});
}

298
modules/client/user/rooms.cc
View file

@ -268,173 +268,6 @@ delete__tags(client &client,
};
}
bool
IRCD_MODULE_EXPORT
ircd::m::user::room_tags::del(const string_view &user_type)
const
{
char typebuf[typebuf_size];
const string_view type
{
_type(typebuf, room.room_id)
};
const user::room user_room
{
user
};
const auto event_idx
{
user_room.get(std::nothrow, type, user_type)
};
if(!event_idx)
return false;
const auto event_id
{
m::event_id(event_idx)
};
redact(user_room, user, event_id, "deleted");
return true;
}
m::event::id::buf
IRCD_MODULE_EXPORT
ircd::m::user::room_tags::set(const string_view &user_type,
const json::object &value)
const
{
char typebuf[typebuf_size];
const string_view type
{
_type(typebuf, room.room_id)
};
const user::room user_room
{
user
};
return send(user_room, user, type, user_type, value);
}
ircd::json::object
IRCD_MODULE_EXPORT
ircd::m::user::room_tags::get(const mutable_buffer &out,
const string_view &type)
const
{
json::object ret;
get(std::nothrow, type, [&out, &ret]
(const string_view &type, const json::object &val)
{
ret = string_view { data(out), copy(out, val) };
});
return ret;
}
void
IRCD_MODULE_EXPORT
ircd::m::user::room_tags::get(const string_view &type,
const closure &closure)
const
{
if(!get(std::nothrow, type, closure))
throw m::NOT_FOUND
{
"account data type '%s' for user %s in room %s not found",
type,
string_view{user.user_id},
string_view{room.room_id}
};
}
bool
IRCD_MODULE_EXPORT
ircd::m::user::room_tags::get(std::nothrow_t,
const string_view &user_type,
const closure &closure)
const
{
char typebuf[typebuf_size];
const string_view type
{
_type(typebuf, room.room_id)
};
const user::room user_room
{
user
};
const event::idx event_idx
{
user_room.get(std::nothrow, type, user_type)
};
return event_idx && m::get(std::nothrow, event_idx, "content", [&user_type, &closure]
(const json::object &content)
{
closure(user_type, content);
});
}
bool
IRCD_MODULE_EXPORT
ircd::m::user::room_tags::for_each(const closure_bool &closure)
const
{
char typebuf[typebuf_size];
const string_view type
{
_type(typebuf, room.room_id)
};
static const event::fetch::opts fopts
{
event::keys::include {"state_key", "content"}
};
const user::room user_room{user};
const room::state state
{
user_room, &fopts
};
return state.for_each(type, event::closure_bool{[&closure]
(const m::event &event)
{
const auto &user_type
{
at<"state_key"_>(event)
};
const auto &content
{
json::get<"content"_>(event)
};
return closure(user_type, content);
}});
}
ircd::string_view
IRCD_MODULE_EXPORT
ircd::m::user::room_tags::_type(const mutable_buffer &out,
const m::room::id &room_id)
{
assert(size(out) >= typebuf_size);
string_view ret;
ret = strlcpy(out, type_prefix);
ret = strlcat(out, room_id);
return ret;
}
resource::response
put__account_data(client &client,
const resource::request &request,
@ -499,134 +332,3 @@ get__account_data(client &client,
return {}; // responded from closure
}
m::event::id::buf
IRCD_MODULE_EXPORT
ircd::m::user::room_account_data::set(const string_view &user_type,
const json::object &value)
const
{
char typebuf[typebuf_size];
const string_view type
{
_type(typebuf, room.room_id)
};
const m::user::room user_room
{
user
};
return send(user_room, user, type, user_type, value);
}
ircd::json::object
IRCD_MODULE_EXPORT
ircd::m::user::room_account_data::get(const mutable_buffer &out,
const string_view &type)
const
{
json::object ret;
get(std::nothrow, type, [&out, &ret]
(const string_view &type, const json::object &val)
{
ret = string_view { data(out), copy(out, val) };
});
return ret;
}
void
IRCD_MODULE_EXPORT
ircd::m::user::room_account_data::get(const string_view &type,
const closure &closure)
const
{
if(!get(std::nothrow, type, closure))
throw m::NOT_FOUND
{
"account data type '%s' for user %s in room %s not found",
type,
string_view{user.user_id},
string_view{room.room_id}
};
}
bool
IRCD_MODULE_EXPORT
ircd::m::user::room_account_data::get(std::nothrow_t,
const string_view &user_type,
const closure &closure)
const
{
char typebuf[typebuf_size];
const string_view type
{
_type(typebuf, room.room_id)
};
const user::room user_room{user};
const room::state state{user_room};
const event::idx event_idx
{
state.get(std::nothrow, type, user_type)
};
return event_idx && m::get(std::nothrow, event_idx, "content", [&user_type, &closure]
(const json::object &content)
{
closure(user_type, content);
});
}
bool
IRCD_MODULE_EXPORT
ircd::m::user::room_account_data::for_each(const closure_bool &closure)
const
{
char typebuf[typebuf_size];
const string_view type
{
_type(typebuf, room.room_id)
};
static const event::fetch::opts fopts
{
event::keys::include {"state_key", "content"}
};
const user::room user_room{user};
const room::state state
{
user_room, &fopts
};
return state.for_each(type, event::closure_bool{[&closure]
(const m::event &event)
{
const auto &user_type
{
at<"state_key"_>(event)
};
const auto &content
{
json::get<"content"_>(event)
};
return closure(user_type, content);
}});
}
ircd::string_view
IRCD_MODULE_EXPORT
ircd::m::user::room_account_data::_type(const mutable_buffer &out,
const m::room::id &room_id)
{
assert(size(out) >= typebuf_size);
string_view ret;
ret = strlcpy(out, type_prefix);
ret = strlcat(out, room_id);
return ret;
}

114
modules/m_user_account_data.cc Normal file
View file

@ -0,0 +1,114 @@
// Matrix Construct
//
// Copyright (C) Matrix Construct Developers, Authors & Contributors
// Copyright (C) 2016-2019 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.
ircd::mapi::header
IRCD_MODULE
{
"Matrix user account data."
};
ircd::m::event::id::buf
IRCD_MODULE_EXPORT
ircd::m::user::account_data::set(const string_view &type,
const json::object &value)
const
{
const m::user::room user_room
{
user
};
return send(user_room, user, "ircd.account_data", type, value);
}
ircd::json::object
IRCD_MODULE_EXPORT
ircd::m::user::account_data::get(const mutable_buffer &out,
const string_view &type)
const
{
json::object ret;
get(std::nothrow, type, [&out, &ret]
(const string_view &type, const json::object &val)
{
ret = string_view { data(out), copy(out, val) };
});
return ret;
}
void
IRCD_MODULE_EXPORT
ircd::m::user::account_data::get(const string_view &type,
const closure &closure)
const
{
if(!get(std::nothrow, type, closure))
throw m::NOT_FOUND
{
"account data type '%s' for user %s not found",
type,
string_view{user.user_id}
};
}
bool
IRCD_MODULE_EXPORT
ircd::m::user::account_data::get(std::nothrow_t,
const string_view &type,
const closure &closure)
const
{
const user::room user_room{user};
const room::state state{user_room};
const event::idx &event_idx
{
state.get(std::nothrow, "ircd.account_data", type)
};
return event_idx && m::get(std::nothrow, event_idx, "content", [&type, &closure]
(const json::object &content)
{
closure(type, content);
});
}
bool
IRCD_MODULE_EXPORT
ircd::m::user::account_data::for_each(const closure_bool &closure)
const
{
static const event::fetch::opts fopts
{
event::keys::include {"state_key", "content"}
};
const user::room user_room{user};
const room::state state
{
user_room, &fopts
};
return state.for_each("ircd.account_data", event::closure_bool{[&closure]
(const m::event &event)
{
const auto &key
{
at<"state_key"_>(event)
};
const auto &val
{
json::get<"content"_>(event)
};
return closure(key, val);
}});
}

146
modules/m_user_room_account_data.cc Normal file
View file

@ -0,0 +1,146 @@
// Matrix Construct
//
// Copyright (C) Matrix Construct Developers, Authors & Contributors
// Copyright (C) 2016-2019 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.
ircd::mapi::header
IRCD_MODULE
{
"Matrix user room account data."
};
ircd::m::event::id::buf
IRCD_MODULE_EXPORT
ircd::m::user::room_account_data::set(const string_view &user_type,
const json::object &value)
const
{
char typebuf[typebuf_size];
const string_view type
{
_type(typebuf, room.room_id)
};
const m::user::room user_room
{
user
};
return send(user_room, user, type, user_type, value);
}
ircd::json::object
IRCD_MODULE_EXPORT
ircd::m::user::room_account_data::get(const mutable_buffer &out,
const string_view &type)
const
{
json::object ret;
get(std::nothrow, type, [&out, &ret]
(const string_view &type, const json::object &val)
{
ret = string_view { data(out), copy(out, val) };
});
return ret;
}
void
IRCD_MODULE_EXPORT
ircd::m::user::room_account_data::get(const string_view &type,
const closure &closure)
const
{
if(!get(std::nothrow, type, closure))
throw m::NOT_FOUND
{
"account data type '%s' for user %s in room %s not found",
type,
string_view{user.user_id},
string_view{room.room_id}
};
}
bool
IRCD_MODULE_EXPORT
ircd::m::user::room_account_data::get(std::nothrow_t,
const string_view &user_type,
const closure &closure)
const
{
char typebuf[typebuf_size];
const string_view type
{
_type(typebuf, room.room_id)
};
const user::room user_room{user};
const room::state state{user_room};
const event::idx event_idx
{
state.get(std::nothrow, type, user_type)
};
return event_idx && m::get(std::nothrow, event_idx, "content", [&user_type, &closure]
(const json::object &content)
{
closure(user_type, content);
});
}
bool
IRCD_MODULE_EXPORT
ircd::m::user::room_account_data::for_each(const closure_bool &closure)
const
{
char typebuf[typebuf_size];
const string_view type
{
_type(typebuf, room.room_id)
};
static const event::fetch::opts fopts
{
event::keys::include {"state_key", "content"}
};
const user::room user_room{user};
const room::state state
{
user_room, &fopts
};
return state.for_each(type, event::closure_bool{[&closure]
(const m::event &event)
{
const auto &user_type
{
at<"state_key"_>(event)
};
const auto &content
{
json::get<"content"_>(event)
};
return closure(user_type, content);
}});
}
ircd::string_view
IRCD_MODULE_EXPORT
ircd::m::user::room_account_data::_type(const mutable_buffer &out,
const m::room::id &room_id)
{
assert(size(out) >= typebuf_size);
string_view ret;
ret = strlcpy(out, type_prefix);
ret = strlcat(out, room_id);
return ret;
}

182
modules/m_user_room_tags.cc Normal file
View file

@ -0,0 +1,182 @@
// Matrix Construct
//
// Copyright (C) Matrix Construct Developers, Authors & Contributors
// Copyright (C) 2016-2019 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.
ircd::mapi::header
IRCD_MODULE
{
"Matrix user room tags."
};
bool
IRCD_MODULE_EXPORT
ircd::m::user::room_tags::del(const string_view &user_type)
const
{
char typebuf[typebuf_size];
const string_view type
{
_type(typebuf, room.room_id)
};
const user::room user_room
{
user
};
const auto event_idx
{
user_room.get(std::nothrow, type, user_type)
};
if(!event_idx)
return false;
const auto event_id
{
m::event_id(event_idx)
};
redact(user_room, user, event_id, "deleted");
return true;
}
ircd::m::event::id::buf
IRCD_MODULE_EXPORT
ircd::m::user::room_tags::set(const string_view &user_type,
const json::object &value)
const
{
char typebuf[typebuf_size];
const string_view type
{
_type(typebuf, room.room_id)
};
const user::room user_room
{
user
};
return send(user_room, user, type, user_type, value);
}
ircd::json::object
IRCD_MODULE_EXPORT
ircd::m::user::room_tags::get(const mutable_buffer &out,
const string_view &type)
const
{
json::object ret;
get(std::nothrow, type, [&out, &ret]
(const string_view &type, const json::object &val)
{
ret = string_view { data(out), copy(out, val) };
});
return ret;
}
void
IRCD_MODULE_EXPORT
ircd::m::user::room_tags::get(const string_view &type,
const closure &closure)
const
{
if(!get(std::nothrow, type, closure))
throw m::NOT_FOUND
{
"account data type '%s' for user %s in room %s not found",
type,
string_view{user.user_id},
string_view{room.room_id}
};
}
bool
IRCD_MODULE_EXPORT
ircd::m::user::room_tags::get(std::nothrow_t,
const string_view &user_type,
const closure &closure)
const
{
char typebuf[typebuf_size];
const string_view type
{
_type(typebuf, room.room_id)
};
const user::room user_room
{
user
};
const event::idx event_idx
{
user_room.get(std::nothrow, type, user_type)
};
return event_idx && m::get(std::nothrow, event_idx, "content", [&user_type, &closure]
(const json::object &content)
{
closure(user_type, content);
});
}
bool
IRCD_MODULE_EXPORT
ircd::m::user::room_tags::for_each(const closure_bool &closure)
const
{
char typebuf[typebuf_size];
const string_view type
{
_type(typebuf, room.room_id)
};
static const event::fetch::opts fopts
{
event::keys::include {"state_key", "content"}
};
const user::room user_room{user};
const room::state state
{
user_room, &fopts
};
return state.for_each(type, event::closure_bool{[&closure]
(const m::event &event)
{
const auto &user_type
{
at<"state_key"_>(event)
};
const auto &content
{
json::get<"content"_>(event)
};
return closure(user_type, content);
}});
}
ircd::string_view
IRCD_MODULE_EXPORT
ircd::m::user::room_tags::_type(const mutable_buffer &out,
const m::room::id &room_id)
{
assert(size(out) >= typebuf_size);
string_view ret;
ret = strlcpy(out, type_prefix);
ret = strlcat(out, room_id);
return ret;
}