From 9bbade37dec0ba98be0e9b20f7a6f45cff59a9b0 Mon Sep 17 00:00:00 2001
From: trilene <trilene@runbox.com>
Date: Fri, 1 Jan 2021 08:46:08 -0500
Subject: Fix call answered on another device

---
 src/timeline/TimelineModel.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/timeline/TimelineModel.cpp')

diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index adef886d..2b5b5794 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -613,8 +613,13 @@ TimelineModel::addEvents(const mtx::responses::Timeline &timeline)
                         std::visit(
                           [this](auto &event) {
                                   event.room_id = room_id_.toStdString();
-                                  if (event.sender != http::client()->user_id().to_string())
+                                  if constexpr (std::is_same_v<std::decay_t<decltype(event)>,
+                                                               RoomEvent<msg::CallAnswer>>)
                                           emit newCallEvent(event);
+                                  else {
+                                          if (event.sender != http::client()->user_id().to_string())
+                                                  emit newCallEvent(event);
+                                  }
                           },
                           e);
                 else if (std::holds_alternative<StateEvent<state::Avatar>>(e))
-- 
cgit 1.5.1


From 3572c111f3f1730e6e8b0fb38a125d69aa1f9116 Mon Sep 17 00:00:00 2001
From: trilene <trilene@runbox.com>
Date: Sun, 10 Jan 2021 12:23:58 -0500
Subject: Fix call invite declined on another device

---
 src/timeline/TimelineModel.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/timeline/TimelineModel.cpp')

diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 2b5b5794..852f584d 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -614,7 +614,9 @@ TimelineModel::addEvents(const mtx::responses::Timeline &timeline)
                           [this](auto &event) {
                                   event.room_id = room_id_.toStdString();
                                   if constexpr (std::is_same_v<std::decay_t<decltype(event)>,
-                                                               RoomEvent<msg::CallAnswer>>)
+                                                               RoomEvent<msg::CallAnswer>> ||
+                                                std::is_same_v<std::decay_t<decltype(event)>,
+                                                               RoomEvent<msg::CallHangUp>>)
                                           emit newCallEvent(event);
                                   else {
                                           if (event.sender != http::client()->user_id().to_string())
-- 
cgit 1.5.1