ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finish fixing capacity enforcement bugs

Browse source
This commit is contained in:
Kelrap 2024-06-06 11:58:11 -04:00
parent db61c1f1cf
commit 8cc377a3f4
11 changed files with 42 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pages/chat/chat.dart
View file

@ -68,7 +68,10 @@ class ChatPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
final room = Matrix.of(context).client.getRoomById(roomId);
if (room == null) {
// #Pangea
if (room == null || room.membership == Membership.leave) {
// if (room == null) {
// Pangea#
return Scaffold(
appBar: AppBar(title: Text(L10n.of(context)!.oopsSomethingWentWrong)),
body: Center(

6
lib/pages/chat/chat_view.dart
View file

@ -20,6 +20,7 @@ import 'package:fluffychat/widgets/unread_rooms_badge.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:future_loading_dialog/future_loading_dialog.dart';
import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart';
import '../../utils/stream_extension.dart';
@ -151,6 +152,11 @@ class ChatView extends StatelessWidget {
context: context,
future: () => controller.room.join(),
);
// #Pangea
controller.room.leaveIfFull().then(
(full) => full ? context.go('/rooms') : null,
);
// Pangea#
}
final bottomSheetPadding = FluffyThemes.isColumnMode(context) ? 16.0 : 8.0;
final scrollUpBannerEventId = controller.scrollUpBannerEventId;

5
lib/pages/chat_details/chat_details_view.dart
View file

@ -36,7 +36,10 @@ class ChatDetailsView extends StatelessWidget {
@override
Widget build(BuildContext context) {
final room = Matrix.of(context).client.getRoomById(controller.roomId!);
if (room == null) {
// #Pangea
if (room == null || room.membership == Membership.leave) {
// if (room == null) {
// Pangea#
return Scaffold(
appBar: AppBar(
title: Text(L10n.of(context)!.oopsSomethingWentWrong),

20
lib/pages/chat_list/space_view.dart
View file

@ -180,13 +180,7 @@ class _SpaceViewState extends State<SpaceView> {
// #Pangea
final room = client.getRoomById(spaceChild.roomId);
if (room != null && (await room.leaveIfFull())) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
duration: const Duration(seconds: 10),
content: Text(L10n.of(context)!.roomFull),
),
);
return;
throw L10n.of(context)!.roomFull;
}
// Pangea#
},
@ -207,17 +201,11 @@ class _SpaceViewState extends State<SpaceView> {
);
await room.join();
await waitForRoom;
if (await room.leaveIfFull()) {
throw L10n.of(context)!.roomFull;
}
},
);
if (await room.leaveIfFull()) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
duration: const Duration(seconds: 10),
content: Text(L10n.of(context)!.roomFull),
),
);
return;
}
if (joinResult.error != null) return;
}
// Pangea#

4
lib/pages/chat_list/utils/on_chat_tap.dart
View file

@ -1,5 +1,6 @@
import 'package:adaptive_dialog/adaptive_dialog.dart';
import 'package:fluffychat/pages/chat/send_file_dialog.dart';
import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:flutter/material.dart';
@ -63,6 +64,9 @@ void onChatTap(Room room, BuildContext context) async {
room.id,
join: true,
);
if (await room.leaveIfFull()) {
throw L10n.of(context)!.roomFull;
}
await room.join();
await waitForRoom;
},

14
lib/pangea/controllers/class_controller.dart
View file

@ -143,14 +143,16 @@ class ClassController extends BaseController {
);
}
// If the room is full, leave
final room =
_pangeaController.matrixState.client.getRoomById(classChunk.roomId);
if (room != null && (await room.leaveIfFull())) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
duration: const Duration(seconds: 10),
content: Text(L10n.of(context)!.roomFull),
),
if (room == null) {
return;
}
if ((await room.leaveIfFull())) {
ClassCodeUtil.messageSnack(
context,
L10n.of(context)!.roomFull,
);
return;
}

1
lib/pangea/extensions/pangea_room_extension/events_extension.dart
View file

@ -2,6 +2,7 @@ part of "pangea_room_extension.dart";
extension EventsRoomExtension on Room {
Future<bool> _leaveIfFull() async {
await postLoad();
if (!isRoomAdmin &&
(_capacity != null) &&
(await _numNonAdmins) >= (int.parse(_capacity!))) {

6
lib/pangea/utils/chat_list_handle_space_tap.dart
View file

@ -33,6 +33,9 @@ void chatListHandleSpaceTap(
context: context,
future: () async {
await space.join();
if (await space.leaveIfFull()) {
throw L10n.of(context)!.roomFull;
}
await space.postLoad();
setActiveSpaceAndCloseChat();
},
@ -65,6 +68,9 @@ void chatListHandleSpaceTap(
context: context,
future: () async {
await space.join();
if (await space.leaveIfFull()) {
throw L10n.of(context)!.roomFull;
}
if (space.isSpace) {
await space.joinAnalyticsRoomsInSpace();
}

1
lib/utils/client_manager.dart
View file

@ -117,6 +117,7 @@ abstract class ClientManager {
PangeaEventTypes.botOptions,
EventTypes.RoomTopic,
EventTypes.RoomAvatar,
PangeaEventTypes.capacity,
// Pangea#
},
logLevel: kReleaseMode ? Level.warning : Level.verbose,

5
lib/utils/url_launcher.dart
View file

@ -159,7 +159,10 @@ class UrlLauncher {
room = matrix.client.getRoomById(roomId!);
}
servers.addAll(identityParts.via);
if (room != null) {
// #Pangea
if (room != null && room.membership != Membership.leave) {
// if (room != null) {
// Pangea#
if (room.isSpace) {
// TODO: Implement navigate to space
context.go('/rooms/${room.id}');

6
lib/widgets/public_room_bottom_sheet.dart
View file

@ -47,12 +47,6 @@ class PublicRoomBottomSheet extends StatelessWidget {
// #Pangea
final room = client.getRoomById(roomId);
if (room != null && (await room.leaveIfFull())) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
duration: const Duration(seconds: 10),
content: Text(L10n.of(context)!.roomFull),
),
);
throw L10n.of(context)!.roomFull;
}
// Pangea#