Merge pull request #320 from krkk/roommemberevent-types

RoomMemberEvent: add isRejectedInvite(), isBan() and isUnban()
quotient-im · Mar 9, 2020 · ef81c79 · ef81c79
2 parents d3ca82b + 4f027cf
commit ef81c79
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/lib/events/roommemberevent.cpp b/lib/events/roommemberevent.cpp
@@ -79,6 +79,12 @@ bool RoomMemberEvent::isInvite() const
     return membership() == MembershipType::Invite && changesMembership();
 }
 
+bool RoomMemberEvent::isRejectedInvite() const
+{
+    return membership() == MembershipType::Leave && prevContent()
+           && prevContent()->membership == MembershipType::Invite;
+}
+
 bool RoomMemberEvent::isJoin() const
 {
     return membership() == MembershipType::Join && changesMembership();
@@ -88,7 +94,19 @@ bool RoomMemberEvent::isLeave() const
 {
     return membership() == MembershipType::Leave && prevContent()
            && prevContent()->membership != membership()
-           && prevContent()->membership != MembershipType::Ban;
+           && prevContent()->membership != MembershipType::Ban
+           && prevContent()->membership != MembershipType::Invite;
+}
+
+bool RoomMemberEvent::isBan() const
+{
+    return membership() == MembershipType::Ban && changesMembership();
+}
+
+bool RoomMemberEvent::isUnban() const
+{
+    return membership() == MembershipType::Leave && prevContent()
+           && prevContent()->membership == MembershipType::Ban;
 }
 
 bool RoomMemberEvent::isRename() const

diff --git a/lib/events/roommemberevent.h b/lib/events/roommemberevent.h
@@ -88,7 +88,10 @@ class RoomMemberEvent : public StateEvent<MemberEventContent> {
     QUrl avatarUrl() const { return content().avatarUrl; }
     QString reason() const { return content().reason; }
     bool changesMembership() const;
+    bool isBan() const;
+    bool isUnban() const;
     bool isInvite() const;
+    bool isRejectedInvite() const;
     bool isJoin() const;
     bool isLeave() const;
     bool isRename() const;