Merge branch 'main' of https://github.com/pangeachat/client into toolbar-selection
Kelrap
1 year ago
commit
d79e78271c
@ -1,85 +1,20 @@
|
||||
import 'package:matrix/matrix.dart';
|
||||
|
||||
extension MembershipUpdate on SyncUpdate {
|
||||
bool isMembershipUpdate(String userId) {
|
||||
return isMembershipUpdateByType(Membership.join, userId) ||
|
||||
isMembershipUpdateByType(Membership.leave, userId) ||
|
||||
isMembershipUpdateByType(Membership.invite, userId);
|
||||
}
|
||||
|
||||
bool isMembershipUpdateByType(Membership type, String userId) {
|
||||
final List<SyncRoomUpdate>? updates = getRoomUpdates(type);
|
||||
if (updates?.isEmpty ?? true) {
|
||||
return false;
|
||||
}
|
||||
|
||||
for (final SyncRoomUpdate update in updates!) {
|
||||
final List<dynamic>? events = getRoomUpdateEvents(type, update);
|
||||
if (hasMembershipUpdate(
|
||||
events,
|
||||
type.name,
|
||||
userId,
|
||||
)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
List<SyncRoomUpdate>? getRoomUpdates(Membership type) {
|
||||
switch (type) {
|
||||
case Membership.join:
|
||||
return rooms?.join?.values.toList();
|
||||
case Membership.leave:
|
||||
return rooms?.leave?.values.toList();
|
||||
case Membership.invite:
|
||||
return rooms?.invite?.values.toList();
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
bool isSpaceChildUpdate(String activeSpaceId) {
|
||||
if (rooms?.join?.isEmpty ?? true) {
|
||||
return false;
|
||||
List<Event> messages(Room chat) {
|
||||
if (rooms?.join == null ||
|
||||
!rooms!.join!.containsKey(chat.id) ||
|
||||
rooms!.join![chat.id]!.timeline?.events == null) {
|
||||
return [];
|
||||
}
|
||||
for (final update in rooms!.join!.entries) {
|
||||
final String spaceId = update.key;
|
||||
final List<MatrixEvent>? timelineEvents = update.value.timeline?.events;
|
||||
final bool isUpdate = timelineEvents != null &&
|
||||
spaceId == activeSpaceId &&
|
||||
timelineEvents.any((event) => event.type == EventTypes.SpaceChild);
|
||||
if (isUpdate) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
List<dynamic>? getRoomUpdateEvents(Membership type, SyncRoomUpdate update) {
|
||||
switch (type) {
|
||||
case Membership.join:
|
||||
return (update as JoinedRoomUpdate).timeline?.events;
|
||||
case Membership.leave:
|
||||
return (update as LeftRoomUpdate).timeline?.events;
|
||||
case Membership.invite:
|
||||
return (update as InvitedRoomUpdate).inviteState;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
bool hasMembershipUpdate(
|
||||
List<dynamic>? events,
|
||||
String membershipType,
|
||||
String userId,
|
||||
) {
|
||||
if (events == null) {
|
||||
return false;
|
||||
return rooms!.join![chat.id]!.timeline!.events!
|
||||
.where(
|
||||
(event) =>
|
||||
event.type == EventTypes.Message &&
|
||||
!event.eventId.startsWith("Pangea Chat"),
|
||||
)
|
||||
.map((event) => Event.fromMatrixEvent(event, chat))
|
||||
.toList();
|
||||
}
|
||||
return events.any(
|
||||
(event) =>
|
||||
event.type == EventTypes.RoomMember &&
|
||||
event.stateKey == userId &&
|
||||
event.content['membership'] == membershipType,
|
||||
);
|
||||
}
|
||||
|
||||
@ -0,0 +1,102 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:fluffychat/pages/chat/chat.dart';
|
||||
import 'package:fluffychat/pangea/extensions/sync_update_extension.dart';
|
||||
import 'package:fluffychat/pangea/utils/bot_name.dart';
|
||||
import 'package:fluffychat/pangea/widgets/chat/round_timer.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:matrix/matrix.dart';
|
||||
|
||||
enum RoundState { notStarted, inProgress, completed }
|
||||
|
||||
class GameRoundModel {
|
||||
static const int timerMaxSeconds = 180;
|
||||
final String adminName = BotName.byEnvironment;
|
||||
|
||||
final ChatController controller;
|
||||
final Completer<void> roundCompleter = Completer<void>();
|
||||
late DateTime createdAt;
|
||||
RoundTimer timer;
|
||||
DateTime? startTime;
|
||||
DateTime? endTime;
|
||||
RoundState state = RoundState.notStarted;
|
||||
StreamSubscription? syncSubscription;
|
||||
final List<String> userMessageIDs = [];
|
||||
final List<String> botMessageIDs = [];
|
||||
|
||||
GameRoundModel({
|
||||
required this.controller,
|
||||
required this.timer,
|
||||
}) {
|
||||
createdAt = DateTime.now();
|
||||
syncSubscription ??= client.onSync.stream.listen(_handleSync);
|
||||
}
|
||||
|
||||
void _handleSync(SyncUpdate update) {
|
||||
final newMessages = update
|
||||
.messages(controller.room)
|
||||
.where((msg) => msg.originServerTs.isAfter(createdAt))
|
||||
.toList();
|
||||
|
||||
final botMessages =
|
||||
newMessages.where((msg) => msg.senderId == adminName).toList();
|
||||
final userMessages =
|
||||
newMessages.where((msg) => msg.senderId != adminName).toList();
|
||||
|
||||
final hasNewBotMessage = botMessages.any(
|
||||
(msg) => !botMessageIDs.contains(msg.eventId),
|
||||
);
|
||||
|
||||
if (hasNewBotMessage) {
|
||||
if (state == RoundState.notStarted) {
|
||||
startRound();
|
||||
} else if (state == RoundState.inProgress) {
|
||||
endRound();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (state == RoundState.inProgress) {
|
||||
for (final message in botMessages) {
|
||||
if (!botMessageIDs.contains(message.eventId)) {
|
||||
botMessageIDs.add(message.eventId);
|
||||
}
|
||||
}
|
||||
|
||||
for (final message in userMessages) {
|
||||
if (!userMessageIDs.contains(message.eventId)) {
|
||||
userMessageIDs.add(message.eventId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Client get client => controller.pangeaController.matrixState.client;
|
||||
|
||||
bool get isCompleted => roundCompleter.isCompleted;
|
||||
|
||||
void startRound() {
|
||||
debugPrint("starting round");
|
||||
state = RoundState.inProgress;
|
||||
startTime = DateTime.now();
|
||||
controller.roundTimerStateKey.currentState?.resetTimer(
|
||||
roundLength: timerMaxSeconds,
|
||||
);
|
||||
controller.roundTimerStateKey.currentState?.startTimer();
|
||||
}
|
||||
|
||||
void endRound() {
|
||||
debugPrint(
|
||||
"ending round, user message IDs: $userMessageIDs, bot message IDs: $botMessageIDs",
|
||||
);
|
||||
endTime = DateTime.now();
|
||||
state = RoundState.completed;
|
||||
controller.roundTimerStateKey.currentState?.resetTimer();
|
||||
syncSubscription?.cancel();
|
||||
roundCompleter.complete();
|
||||
}
|
||||
|
||||
void dispose() {
|
||||
syncSubscription?.cancel();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,113 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
/// Create a timer that counts down to the given time
|
||||
/// Default duration is 180 seconds
|
||||
class RoundTimer extends StatefulWidget {
|
||||
final int timerMaxSeconds;
|
||||
final Duration roundDuration;
|
||||
|
||||
const RoundTimer({
|
||||
super.key,
|
||||
this.timerMaxSeconds = 180,
|
||||
this.roundDuration = const Duration(seconds: 1),
|
||||
});
|
||||
|
||||
@override
|
||||
RoundTimerState createState() => RoundTimerState();
|
||||
}
|
||||
|
||||
class RoundTimerState extends State<RoundTimer> {
|
||||
int currentSeconds = 0;
|
||||
Timer? _timer;
|
||||
bool isTiming = false;
|
||||
Duration? duration;
|
||||
int timerMaxSeconds = 180;
|
||||
|
||||
void resetTimer({Duration? roundDuration, int? roundLength}) {
|
||||
if (_timer != null) {
|
||||
_timer!.cancel();
|
||||
isTiming = false;
|
||||
}
|
||||
if (roundDuration != null) {
|
||||
duration = roundDuration;
|
||||
}
|
||||
if (roundLength != null) {
|
||||
timerMaxSeconds = roundLength;
|
||||
}
|
||||
setState(() {
|
||||
currentSeconds = 0;
|
||||
});
|
||||
}
|
||||
|
||||
int get remainingTime => timerMaxSeconds - currentSeconds;
|
||||
|
||||
String get timerText =>
|
||||
'${(remainingTime ~/ 60).toString().padLeft(2, '0')}: ${(remainingTime % 60).toString().padLeft(2, '0')}';
|
||||
|
||||
startTimer() {
|
||||
_timer = Timer.periodic(duration ?? widget.roundDuration, (timer) {
|
||||
setState(() {
|
||||
currentSeconds++;
|
||||
if (currentSeconds >= timerMaxSeconds) timer.cancel();
|
||||
});
|
||||
});
|
||||
setState(() {
|
||||
isTiming = true;
|
||||
});
|
||||
}
|
||||
|
||||
stopTimer() {
|
||||
if (_timer != null) {
|
||||
_timer!.cancel();
|
||||
}
|
||||
setState(() {
|
||||
isTiming = false;
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
duration = widget.roundDuration;
|
||||
timerMaxSeconds = widget.timerMaxSeconds;
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
if (_timer != null) {
|
||||
_timer!.cancel();
|
||||
}
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Material(
|
||||
color: const Color.fromARGB(255, 126, 22, 14),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(
|
||||
5,
|
||||
),
|
||||
child: Center(
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Text(timerText),
|
||||
// Row(
|
||||
// crossAxisAlignment: CrossAxisAlignment.center,
|
||||
// children: [
|
||||
// IconButton(
|
||||
// onPressed: isTiming ? stopTimeout : startTimeout,
|
||||
// icon: Icon(isTiming ? Icons.pause_circle : Icons.play_circle),
|
||||
// ),
|
||||
// ],
|
||||
// ),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue