From c7620cca6f9cd5791d3a8955c69eb5a4b3032aff Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <erohee@amdocs.com>
Date: Wed, 24 Sep 2014 13:17:47 +0200
Subject: [PATCH] SYWEB-27: Public rooms with 2 users must not considered as
1:1 chat room and so, they must no be renamed
---
webclient/components/matrix/matrix-filter.js | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/webclient/components/matrix/matrix-filter.js b/webclient/components/matrix/matrix-filter.js
index c27746b380..e6f2acc5fd 100644
--- a/webclient/components/matrix/matrix-filter.js
+++ b/webclient/components/matrix/matrix-filter.js
@@ -31,14 +31,21 @@ angular.module('matrixFilter', [])
if (room) {
// Get name from room state date
var room_name_event = room["m.room.name"];
+
+ // Determine if it is a public room
+ var isPublicRoom = false;
+ if (room["m.room.join_rules"] && room["m.room.join_rules"].content) {
+ isPublicRoom = ("public" === room["m.room.join_rules"].content.join_rule);
+ }
+
if (room_name_event) {
roomName = room_name_event.content.name;
}
else if (alias) {
roomName = alias;
}
- else if (room.members) {
-
+ else if (room.members && !isPublicRoom) { // Do not rename public room
+
var user_id = matrixService.config().user_id;
// Else, build the name from its users
--
GitLab