aboutsummaryrefslogtreecommitdiff
path: root/room.cpp
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2018-03-24 16:29:00 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2018-03-24 16:29:00 +0900
commit6b960db9b33efe6f6a014aed08b9177a2ba201f8 (patch)
tree95c54ee17a7da4ad738ebeb6f85d86cec6ed14f5 /room.cpp
parenta5428e53525afbc6fe6f697edb4f742d84c9ae0c (diff)
parent47cb949973a05cea6fb3a13ffd19b6e07e7720ae (diff)
downloadlibquotient-6b960db9b33efe6f6a014aed08b9177a2ba201f8.tar.gz
libquotient-6b960db9b33efe6f6a014aed08b9177a2ba201f8.zip
Merge branch 'kitsune-direct-chats'
Diffstat (limited to 'room.cpp')
-rw-r--r--room.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/room.cpp b/room.cpp
index 6c8d762b..48c27ba0 100644
--- a/room.cpp
+++ b/room.cpp
@@ -1424,6 +1424,11 @@ void Room::processStateEvents(const RoomEvents& events)
auto memberEvent = static_cast<RoomMemberEvent*>(event);
auto u = user(memberEvent->userId());
u->processEvent(memberEvent, this);
+ if (u == localUser() && memberJoinState(u) == JoinState::Invite
+ && memberEvent->isDirect())
+ connection()->addToDirectChats(this,
+ user(memberEvent->senderId()));
+
if( memberEvent->membership() == MembershipType::Join )
{
if (memberJoinState(u) != JoinState::Join)