inex/famedlysdk
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'room-fix-name-calc' into 'master'

Browse source 
[Room] Fix name

See merge request famedly/famedlysdk!125
This commit is contained in:
Christian Pauly 2019-11-26 12:46:46 +00:00
parent b06c6254c3 7ae3432c5d
commit fd0f7ab3ea
1 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
lib/src/Room.dart
View file

@ -98,27 +98,9 @@ class Room {
onRoomUpdate onUpdate; onRoomUpdate onUpdate;
/// The name of the room if set by a participant. /// The name of the room if set by a participant.
String get name { String get name => states["m.room.name"] != null
if (states["m.room.name"] != null && ? states["m.room.name"].content["name"]
!(states["m.room.name"].content["name"]?.isEmpty ?? true)) : "";
return states["m.room.name"].content["name"];
if (canonicalAlias != null && !canonicalAlias.isEmpty)
return canonicalAlias.substring(1, canonicalAlias.length).split(":")[0];
if (mHeroes != null && mHeroes.length > 0) {
String displayname = "";
for (int i = 0; i < mHeroes.length; i++) {
User hero = states[mHeroes[i]] != null
? states[mHeroes[i]].asUser
: User(mHeroes[i]);
displayname += hero.calcDisplayname() + ", ";
}
return displayname.substring(0, displayname.length - 2);
}
if (membership == Membership.invite && states.containsKey(client.userID)) {
return states[client.userID].sender.calcDisplayname();
}
return "Empty chat";
}
/// The topic of the room if set by a participant. /// The topic of the room if set by a participant.
String get topic => states["m.room.topic"] != null String get topic => states["m.room.topic"] != null
@ -131,8 +113,9 @@ class Room {
return MxContent(states["m.room.avatar"].content["url"]); return MxContent(states["m.room.avatar"].content["url"]);
if (mHeroes != null && mHeroes.length == 1 && states[mHeroes[0]] != null) if (mHeroes != null && mHeroes.length == 1 && states[mHeroes[0]] != null)
return states[mHeroes[0]].asUser.avatarUrl; return states[mHeroes[0]].asUser.avatarUrl;
if (membership == Membership.invite && states.containsKey(client.userID)) { if (membership == Membership.invite &&
return states[client.userID].sender.avatarUrl; getState("m.room.member", client.userID) != null) {
return getState("m.room.member", client.userID).sender.avatarUrl;
} }
return MxContent(""); return MxContent("");
} }
@ -215,17 +198,23 @@ class Room {
/// Calculates the displayname. First checks if there is a name, then checks for a canonical alias and /// Calculates the displayname. First checks if there is a name, then checks for a canonical alias and
/// then generates a name from the heroes. /// then generates a name from the heroes.
String get displayname { String get displayname {
if (name != null && !name.isEmpty) return name; if (name != null && name.isNotEmpty) return name;
if (canonicalAlias != null && if (canonicalAlias != null &&
!canonicalAlias.isEmpty && !canonicalAlias.isEmpty &&
canonicalAlias.length > 3) canonicalAlias.length > 3)
return canonicalAlias.substring(1, canonicalAlias.length).split(":")[0]; return canonicalAlias.substring(1, canonicalAlias.length).split(":")[0];
if (mHeroes.length > 0) { if (mHeroes.length > 0 && mHeroes.any((h) => h.isNotEmpty)) {
String displayname = ""; String displayname = "";
for (int i = 0; i < mHeroes.length; i++) for (int i = 0; i < mHeroes.length; i++) {
if (mHeroes[i].isEmpty) continue;
displayname += User(mHeroes[i]).calcDisplayname() + ", "; displayname += User(mHeroes[i]).calcDisplayname() + ", ";
}
return displayname.substring(0, displayname.length - 2); return displayname.substring(0, displayname.length - 2);
} }
if (membership == Membership.invite &&
getState("m.room.member", client.userID) != null) {
return getState("m.room.member", client.userID).sender.calcDisplayname();
}
return "Empty chat"; return "Empty chat";
} }