felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-22 17:42:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

RoomPreviewData: Add room canonical alias property.

Browse Source
This commit is contained in:
SBiOSoftWhare
2020-02-10 17:49:45 +01:00
parent 66f7c4df5d
commit 2b5bb2bdde
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Model/Room/RoomPreviewData.h
+1
View File
@@ -62,6 +62,7 @@
@property (nonatomic) NSString *roomName;
@property (nonatomic, readonly) NSString *roomTopic;
@property (nonatomic, readonly) NSString *roomAvatarUrl;
@property (nonatomic, readonly) NSString *roomCanonicalAlias;
@property (nonatomic, readonly) NSArray<NSString*> *roomAliases;
@property (nonatomic, readonly) NSInteger numJoinedMembers; // -1 if unknown.
Riot/Model/Room/RoomPreviewData.m
+9 -1
View File
@@ -54,14 +54,22 @@
_roomName = publicRoom.displayname;
_roomAvatarUrl = publicRoom.avatarUrl;
_roomTopic = publicRoom.topic;
_roomCanonicalAlias = publicRoom.canonicalAlias;
_roomAliases = publicRoom.aliases;
_numJoinedMembers = publicRoom.numJoinedMembers;
// First try to fallback to the name if displayname isn't present
if (!_roomName.length) {
if (!_roomName.length)
{
_roomName = publicRoom.name;
}
if (!_roomName.length)
{
// Use the canonical alias if present.
_roomName = publicRoom.canonicalAlias;
}
if (!_roomName.length)
{
// Consider the room aliases to define a default room name.