Clean up code

nyxx-discord · Oct 17, 2024 · eb18dba · eb18dba
1 parent 6d0689b
commit eb18dba
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/lib/src/checks.dart b/lib/src/checks.dart
@@ -46,6 +46,6 @@ final jellyfinFeatureCreateInstanceCommandCheck = Check(
 
     final roleId = Snowflake.parse(setting!.dataAsJson!['create_instance_role']);
 
-    return context.member!.roleIds.contains(roleId);
+    return (context.member?.permissions?.isAdministrator ?? false) || context.member!.roleIds.contains(roleId);
   },
 );
diff --git a/lib/src/commands/jellyfin.dart b/lib/src/commands/jellyfin.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:collection/collection.dart';
-import 'package:human_duration_parser/human_duration_parser.dart';
 import 'package:injector/injector.dart';
 import 'package:intl/intl.dart';
 import 'package:nyxx/nyxx.dart';
@@ -18,20 +17,6 @@ import 'package:tentacle/tentacle.dart';
 
 final taskProgressFormat = NumberFormat("0.00");
 
-Iterable<MessageBuilder> spliceEmbedsForMessageBuilders(Iterable<EmbedBuilder> embeds, [int sliceSize = 2]) sync* {
-  for (final splicedEmbeds in embeds.slices(sliceSize)) {
-    yield MessageBuilder(embeds: splicedEmbeds);
-  }
-}
-
-Duration? getDurationFromStringOrDefault(String? durationString, Duration? defaultDuration) {
-  if (durationString == null) {
-    return defaultDuration;
-  }
-
-  return parseStringToDuration(durationString) ?? defaultDuration;
-}
-
 String? valueOrNullIfNotDefault(String? value, [String ifNotDefault = 'Unlimited']) {
   if (value == ifNotDefault) {
     return null;

diff --git a/lib/src/util/util.dart b/lib/src/util/util.dart
@@ -1,6 +1,8 @@
 import 'dart:io';
 import 'dart:math';
 
+import 'package:collection/collection.dart';
+import 'package:human_duration_parser/human_duration_parser.dart';
 import 'package:nyxx/nyxx.dart';
 
 final random = Random();
@@ -42,3 +44,17 @@ String? valueOrNull(String? value) {
 String generateRandomString(int length) =>
     String.fromCharCodes(Iterable.generate(length, (_) => _chars.codeUnitAt(random.nextInt(_chars.length))))
         .toUpperCase();
+
+Iterable<MessageBuilder> spliceEmbedsForMessageBuilders(Iterable<EmbedBuilder> embeds, [int sliceSize = 2]) sync* {
+  for (final splicedEmbeds in embeds.slices(sliceSize)) {
+    yield MessageBuilder(embeds: splicedEmbeds);
+  }
+}
+
+Duration? getDurationFromStringOrDefault(String? durationString, Duration? defaultDuration) {
+  if (durationString == null) {
+    return defaultDuration;
+  }
+
+  return parseStringToDuration(durationString) ?? defaultDuration;
+}