OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: null safe commands_extension

This commit is contained in:
Lukas Lihotzki 2021-09-22 16:05:25 +02:00 committed by Nicolas Werner
parent 01c3b4d0bc
commit 5da26a6923
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/src/utils/commands_extension.dart
View File

@ -1,4 +1,3 @@
// @dart=2.9
/* /*
* Famedly Matrix SDK * Famedly Matrix SDK
* Copyright (C) 2021 Famedly GmbH * Copyright (C) 2021 Famedly GmbH
@ -25,14 +24,14 @@ extension CommandsClientExtension on Client {
/// Add a command to the command handler. `command` is its name, and `callback` is the /// Add a command to the command handler. `command` is its name, and `callback` is the
/// callback to invoke /// callback to invoke
void addCommand( void addCommand(
String command, FutureOr<String> Function(CommandArgs) callback) { String command, FutureOr<String?> Function(CommandArgs) callback) {
commands[command.toLowerCase()] = callback; commands[command.toLowerCase()] = callback;
} }
/// Parse and execute a string, `msg` is the input. Optionally `inReplyTo` is the event being /// Parse and execute a string, `msg` is the input. Optionally `inReplyTo` is the event being
/// replied to and `editEventId` is the eventId of the event being replied to /// replied to and `editEventId` is the eventId of the event being replied to
Future<String> parseAndRunCommand(Room room, String msg, Future<String?> parseAndRunCommand(Room room, String msg,
{Event inReplyTo, String editEventId, String txid}) async { {Event? inReplyTo, String? editEventId, String? txid}) async {
final args = CommandArgs( final args = CommandArgs(
inReplyTo: inReplyTo, inReplyTo: inReplyTo,
editEventId: editEventId, editEventId: editEventId,
@ -41,9 +40,10 @@ extension CommandsClientExtension on Client {
txid: txid, txid: txid,
); );
if (!msg.startsWith('/')) { if (!msg.startsWith('/')) {
if (commands.containsKey('send')) { final sendCommand = commands['send'];
if (sendCommand != null) {
args.msg = msg; args.msg = msg;
return await commands['send'](args); return await sendCommand(args);
} }
return null; return null;
} }
@ -57,13 +57,17 @@ extension CommandsClientExtension on Client {
} else { } else {
command = msg.toLowerCase(); command = msg.toLowerCase();
} }
if (commands.containsKey(command)) { final commandOp = commands[command];
return await commands[command](args); if (commandOp != null) {
return await commandOp(args);
} }
if (msg.startsWith('/') && commands.containsKey('send')) { if (msg.startsWith('/') && commands.containsKey('send')) {
// re-set to include the "command" // re-set to include the "command"
args.msg = msg; final sendCommand = commands['send'];
return await commands['send'](args); if (sendCommand != null) {
args.msg = msg;
return await sendCommand(args);
}
} }
return null; return null;
} }
@ -119,10 +123,11 @@ extension CommandsClientExtension on Client {
); );
}); });
addCommand('react', (CommandArgs args) async { addCommand('react', (CommandArgs args) async {
if (args.inReplyTo == null) { final inReplyTo = args.inReplyTo;
if (inReplyTo == null) {
return null; return null;
} }
return await args.room.sendReaction(args.inReplyTo.eventId, args.msg); return await args.room.sendReaction(inReplyTo.eventId, args.msg);
}); });
addCommand('join', (CommandArgs args) async { addCommand('join', (CommandArgs args) async {
await args.room.client.joinRoom(args.msg); await args.room.client.joinRoom(args.msg);
@ -137,12 +142,12 @@ extension CommandsClientExtension on Client {
if (parts.isEmpty) { if (parts.isEmpty) {
return null; return null;
} }
var pl = 50; int? pl;
if (parts.length >= 2) { if (parts.length >= 2) {
pl = int.tryParse(parts[1]); pl = int.tryParse(parts[1]);
} }
final mxid = parts.first; final mxid = parts.first;
return await args.room.setPower(mxid, pl); return await args.room.setPower(mxid, pl ?? 50);
}); });
addCommand('kick', (CommandArgs args) async { addCommand('kick', (CommandArgs args) async {
final parts = args.msg.split(' '); final parts = args.msg.split(' ');
@ -200,10 +205,14 @@ extension CommandsClientExtension on Client {
class CommandArgs { class CommandArgs {
String msg; String msg;
String editEventId; String? editEventId;
Event inReplyTo; Event? inReplyTo;
Room room; Room room;
String txid; String? txid;
CommandArgs( CommandArgs(
{this.msg, this.editEventId, this.inReplyTo, this.room, this.txid}); {required this.msg,
this.editEventId,
this.inReplyTo,
required this.room,
this.txid});
} }