feat: Add support for restricted join rule
This commit is contained in:
parent
9eb1f4fc1e
commit
d6dcbe0421
3 changed files with 56 additions and 8 deletions
|
|
@ -3392,5 +3392,23 @@
|
||||||
"type": "int"
|
"type": "int"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"spaceMemberOf": "Space member of {spaces}",
|
||||||
|
"@spaceMemberOf": {
|
||||||
|
"type": "String",
|
||||||
|
"placeholders": {
|
||||||
|
"spaces": {
|
||||||
|
"type": "String"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"spaceMemberOfCanKnock": "Space member of {spaces} can knock",
|
||||||
|
"@spaceMemberOfCanKnock": {
|
||||||
|
"type": "String",
|
||||||
|
"placeholders": {
|
||||||
|
"spaces": {
|
||||||
|
"type": "String"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,16 @@ class ChatAccessSettingsController extends State<ChatAccessSettings> {
|
||||||
bool historyVisibilityLoading = false;
|
bool historyVisibilityLoading = false;
|
||||||
bool guestAccessLoading = false;
|
bool guestAccessLoading = false;
|
||||||
Room get room => Matrix.of(context).client.getRoomById(widget.roomId)!;
|
Room get room => Matrix.of(context).client.getRoomById(widget.roomId)!;
|
||||||
|
Set<Room> get knownSpaceParents => {
|
||||||
|
...room.client.rooms.where(
|
||||||
|
(space) =>
|
||||||
|
space.isSpace &&
|
||||||
|
space.spaceChildren.any((child) => child.roomId == room.id),
|
||||||
|
),
|
||||||
|
...room.spaceParents
|
||||||
|
.map((parent) => room.client.getRoomById(parent.roomId ?? ''))
|
||||||
|
.whereType<Room>(),
|
||||||
|
};
|
||||||
|
|
||||||
String get roomVersion =>
|
String get roomVersion =>
|
||||||
room
|
room
|
||||||
|
|
@ -46,9 +56,12 @@ class ChatAccessSettingsController extends State<ChatAccessSettings> {
|
||||||
joinRules.remove(JoinRules.knock);
|
joinRules.remove(JoinRules.knock);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Not yet supported in FluffyChat:
|
if (knownSpaceParents.isEmpty) {
|
||||||
joinRules.remove(JoinRules.restricted);
|
joinRules.remove(JoinRules.restricted);
|
||||||
joinRules.remove(JoinRules.knockRestricted);
|
if (roomVersionInt != null && roomVersionInt <= 6) {
|
||||||
|
joinRules.remove(JoinRules.knockRestricted);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// If an unsupported join rule is the current join rule, display it:
|
// If an unsupported join rule is the current join rule, display it:
|
||||||
final currentJoinRule = room.joinRules;
|
final currentJoinRule = room.joinRules;
|
||||||
|
|
@ -64,7 +77,13 @@ class ChatAccessSettingsController extends State<ChatAccessSettings> {
|
||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await room.setJoinRules(newJoinRules);
|
await room.setJoinRules(
|
||||||
|
newJoinRules,
|
||||||
|
allowConditionRoomId: {JoinRules.restricted, JoinRules.knockRestricted}
|
||||||
|
.contains(newJoinRules)
|
||||||
|
? knownSpaceParents.first.id
|
||||||
|
: null,
|
||||||
|
);
|
||||||
} catch (e, s) {
|
} catch (e, s) {
|
||||||
Logs().w('Unable to change join rules', e, s);
|
Logs().w('Unable to change join rules', e, s);
|
||||||
if (mounted) {
|
if (mounted) {
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,10 @@ class ChatAccessSettingsPageView extends StatelessWidget {
|
||||||
enabled: !controller.joinRulesLoading &&
|
enabled: !controller.joinRulesLoading &&
|
||||||
room.canChangeJoinRules,
|
room.canChangeJoinRules,
|
||||||
title: Text(
|
title: Text(
|
||||||
joinRule.localizedString(L10n.of(context)),
|
joinRule.localizedString(
|
||||||
|
L10n.of(context),
|
||||||
|
controller.knownSpaceParents,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
value: joinRule,
|
value: joinRule,
|
||||||
),
|
),
|
||||||
|
|
@ -280,7 +283,7 @@ class _AliasListTile extends StatelessWidget {
|
||||||
}
|
}
|
||||||
|
|
||||||
extension JoinRulesDisplayString on JoinRules {
|
extension JoinRulesDisplayString on JoinRules {
|
||||||
String localizedString(L10n l10n) {
|
String localizedString(L10n l10n, Set<Room> spaceParents) {
|
||||||
switch (this) {
|
switch (this) {
|
||||||
case JoinRules.public:
|
case JoinRules.public:
|
||||||
return l10n.anyoneCanJoin;
|
return l10n.anyoneCanJoin;
|
||||||
|
|
@ -291,9 +294,17 @@ extension JoinRulesDisplayString on JoinRules {
|
||||||
case JoinRules.private:
|
case JoinRules.private:
|
||||||
return l10n.noOneCanJoin;
|
return l10n.noOneCanJoin;
|
||||||
case JoinRules.restricted:
|
case JoinRules.restricted:
|
||||||
return l10n.restricted;
|
return l10n.spaceMemberOf(
|
||||||
|
spaceParents
|
||||||
|
.map((space) => space.getLocalizedDisplayname(MatrixLocals(l10n)))
|
||||||
|
.join(', '),
|
||||||
|
);
|
||||||
case JoinRules.knockRestricted:
|
case JoinRules.knockRestricted:
|
||||||
return l10n.knockRestricted;
|
return l10n.spaceMemberOfCanKnock(
|
||||||
|
spaceParents
|
||||||
|
.map((space) => space.getLocalizedDisplayname(MatrixLocals(l10n)))
|
||||||
|
.join(', '),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue