MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 15:33:54 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️ Improve MXID ctor related.

Browse source
This commit is contained in:
Jason Volk 2018-01-18 20:44:55 -08:00
parent 936f138a3f
commit 497b4ec552
2 changed files with 17 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,7 @@ struct ircd::m::id
IRCD_USING_OVERLOAD(generate, m::generate);
id(const enum sigil &, const mutable_buffer &, const generate_t &, const string_view &host);
id(const enum sigil &, const mutable_buffer &, const string_view &name, const string_view &host);
id(const enum sigil &, const mutable_buffer &, const string_view &local, const string_view &host);
id(const enum sigil &, const mutable_buffer &, const string_view &id);
id(const enum sigil &, const string_view &id);
id(const string_view &id);

64
ircd/m/id.cc
View file

@ -414,16 +414,15 @@ ircd::m::id::id(const id::sigil &sigil,
validate(sigil, id);
}
ircd::m::id::id(const id::sigil &sigil,
ircd::m::id::id(const enum sigil &sigil,
const mutable_buffer &buf,
const string_view &id)
:string_view
{[&sigil, &buf, &id]
const string_view &local,
const string_view &host)
:string_view{[&sigil, &buf, &local, &host]
{
const string_view src
{
buffer::data(buf),
buffer::data(buf) != id.data()? strlcpy(buffer::data(buf), id, buffer::size(buf)) : id.size()
buffer::data(buf), size_t(fmt::sprintf(buf, "%c%s:%s", char(sigil), local, host))
};
return parser(sigil, src);
@ -431,57 +430,26 @@ ircd::m::id::id(const id::sigil &sigil,
{
}
ircd::m::id::id(const enum sigil &sigil,
ircd::m::id::id(const id::sigil &sigil,
const mutable_buffer &buf,
const string_view &name,
const string_view &host)
:string_view{[&]() -> string_view
const string_view &id)
:string_view{[&sigil, &buf, &id]
{
//TODO: output grammar
using buffer::data;
using buffer::size;
const size_t &max{size(buf)};
if(!max)
return {};
size_t len(0);
if(!startswith(name, sigil))
buf[len++] = char(sigil);
const auto has_sep
const auto len
{
std::count(std::begin(name), std::end(name), ':')
buffer::data(buf) != id.data()?
strlcpy(buffer::data(buf), id, buffer::size(buf)):
id.size()
};
if(!has_sep && host.empty())
const string_view src
{
len += strlcpy(data(buf) + len, name, max - len);
}
else if(!has_sep && !host.empty())
{
len += fmt::snprintf(data(buf) + len, max - len, "%s:%s",
name,
host);
}
else if(has_sep == 1 && !host.empty() && !split(name, ':').second.empty())
{
len += strlcpy(data(buf) + len, name, max - len);
}
else if(has_sep >= 1 && !host.empty())
{
if(split(name, ':').second != host)
throw INVALID_MXID("MXID must be on host '%s'", host);
buffer::data(buf), len
};
len += strlcpy(data(buf) + len, name, max - len);
}
//else throw INVALID_MXID("Not a valid '%s' mxid", reflect(sigil));
return { data(buf), len };
return parser(sigil, src);
}()}
{
validate(sigil, *this);
}
ircd::m::id::id(const enum sigil &sigil,