aboutsummaryrefslogtreecommitdiff
path: root/lib/user.cpp
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2019-07-06 20:13:38 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2019-07-06 20:13:38 +0900
commit025e5ab7d90ce8cf474567457301de32d5a3e34a (patch)
treea56ab34bff688275a9deabd920539bebc247cc8e /lib/user.cpp
parentcbb4f219d5c79f81706019c0679222d5ccee4a4c (diff)
downloadlibquotient-025e5ab7d90ce8cf474567457301de32d5a3e34a.tar.gz
libquotient-025e5ab7d90ce8cf474567457301de32d5a3e34a.zip
Be stricter on usage of stateKey
A few places in the library dealt with state events without any notion of state_key inside events, including StateEvent[Base] and relevant functions in Room. A number of workarounds have been made; e.g., Room::setMemberState() accepted userId as a separate parameter, ignoring the state key inside the RoomMemberEvent already passed to it, and Room::setLocalAliases() had a bug in the initial version where the function still tried to pass aliases in an event with an empty state key. This commit fixes this shortcoming: StateEventBase now gets stateKey as one more parameter, Room::Private::getCurrentState() respects stateKey and returns properly constructed stub events, and Room::setMemberState() gives way to a more generic Room::setState() that works uniformly with whatever state event you pass to it.
Diffstat (limited to 'lib/user.cpp')
-rw-r--r--lib/user.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/user.cpp b/lib/user.cpp
index 7b695618..8bdcbe97 100644
--- a/lib/user.cpp
+++ b/lib/user.cpp
@@ -292,7 +292,7 @@ void User::rename(const QString& newName, const Room* r)
const auto actualNewName = sanitized(newName);
MemberEventContent evtC;
evtC.displayName = actualNewName;
- connect(r->setMemberState(id(), RoomMemberEvent(move(evtC))),
+ connect(r->setState(RoomMemberEvent(id(), move(evtC))),
&BaseJob::success, this, [=] { updateName(actualNewName, r); });
}