From f95a915f2e496631a04e0a4d8d75788e7295aae3 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Fri, 27 Apr 2018 13:39:17 +0900
Subject: [PATCH] Cache bridge names along with user names

Otherwise the bridge is forgotten after restart. This bumps the cache
version.
---
 lib/connection.cpp | 2 +-
 lib/room.cpp       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/connection.cpp b/lib/connection.cpp
index f2bbf9031..5f930d57c 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -848,7 +848,7 @@ void Connection::setHomeserver(const QUrl& url)
     emit homeserverChanged(homeserver());
 }
 
-static constexpr int CACHE_VERSION_MAJOR = 7;
+static constexpr int CACHE_VERSION_MAJOR = 8;
 static constexpr int CACHE_VERSION_MINOR = 0;
 
 void Connection::saveState(const QUrl &toFile) const
diff --git a/lib/room.cpp b/lib/room.cpp
index 128a4f48b..c6c1bafd8 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -1796,7 +1796,7 @@ QJsonObject Room::Private::toJson() const
         for (const auto *m : membersMap)
             appendStateEvent(stateEvents, QStringLiteral("m.room.member"),
                 { { QStringLiteral("membership"), QStringLiteral("join") }
-                , { QStringLiteral("displayname"), m->name(q) }
+                , { QStringLiteral("displayname"), m->rawName(q) }
                 , { QStringLiteral("avatar_url"), m->avatarUrl(q).toString() }
             }, m->id());