Merge remote-tracking branch 'origin/develop' into develop
commit
51dc8d9528
|
@ -146,15 +146,14 @@ function textForServerACLEvent(ev) {
|
||||||
text = `${senderDisplayName} changed the server ACLs for this room: `;
|
text = `${senderDisplayName} changed the server ACLs for this room: `;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!Array.isArray(current.allow)) {
|
||||||
|
current.allow = [];
|
||||||
|
}
|
||||||
/* If we know for sure everyone is banned, don't bother showing the diff view */
|
/* If we know for sure everyone is banned, don't bother showing the diff view */
|
||||||
if (current.allow.length === 0) {
|
if (current.allow.length === 0) {
|
||||||
return text + "🎉 All servers are banned from participating! This room can no longer be used.";
|
return text + "🎉 All servers are banned from participating! This room can no longer be used.";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!Array.isArray(current.allow)) {
|
|
||||||
current.allow = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!Array.isArray(current.deny)) {
|
if (!Array.isArray(current.deny)) {
|
||||||
current.deny = [];
|
current.deny = [];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue