thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add inviter to the invite reason

Browse source 
fixes #622
This commit is contained in:
Nicolas Werner 2023-06-10 00:49:49 +02:00
parent c7b78ca182
commit 0dbc9444c3
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
6 changed files with 102 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Cache.cpp
View file

@ -2128,8 +2128,16 @@ Cache::saveInvite(lmdb::txn &txn,
auto display_name =
msg->content.display_name.empty() ? msg->state_key : msg->content.display_name;
MemberInfo tmp{
display_name, msg->content.avatar_url, msg->content.reason, msg->content.is_direct};
std::string inviter = "";
if (msg->content.membership == mtx::events::state::Membership::Invite) {
inviter = msg->sender;
}
MemberInfo tmp{display_name,
msg->content.avatar_url,
inviter,
msg->content.reason,
msg->content.is_direct};
membersdb.put(txn, msg->state_key, nlohmann::json(tmp).dump());
} else {
@ -5173,6 +5181,8 @@ to_json(nlohmann::json &j, const MemberInfo &info)
{
j["name"] = info.name;
j["avatar_url"] = info.avatar_url;
if (!info.inviter.empty())
j["inviter"] = info.inviter;
if (info.is_direct)
j["is_direct"] = info.is_direct;
if (!info.reason.empty())
@ -5186,6 +5196,7 @@ from_json(const nlohmann::json &j, MemberInfo &info)
info.avatar_url = j.value("avatar_url", "");
info.is_direct = j.value("is_direct", false);
info.reason = j.value("reason", "");
info.inviter = j.value("inviter", "");
}
void