Merge pull request #32 from nyxx-discord/maintenance/update-postgres-…

…package maintenance: Update postgres package
nyxx-discord · Oct 17, 2024 · 987fd72 · 987fd72
2 parents 3b41455 + e04bf40
commit 987fd72
Show file tree

Hide file tree

Showing 20 changed files with 1,589 additions and 479 deletions.
diff --git a/bin/running_on_dart.dart b/bin/running_on_dart.dart
@@ -36,11 +36,18 @@ void main() async {
     ..addConverter(manageableTagConverter)
     ..addConverter(durationConverter)
     ..addConverter(reminderConverter)
-    ..addConverter(packageDocsConverter);
+    ..addConverter(packageDocsConverter)
+    ..addConverter(jellyfinConfigConverter)
+    ..addConverter(jellyfinConfigUserConverter);
 
   commands.onCommandError.listen((error) {
     if (error is CheckFailedException) {
       error.context.respond(MessageBuilder(content: "Sorry, you can't use that command!"));
+      return;
+    }
+
+    if (error is UncaughtException && error.exception is JellyfinConfigNotFoundException) {
+      error.context.respond(MessageBuilder(content: error.message));
     }
   });
 
@@ -70,10 +77,10 @@ void main() async {
     ..registerSingleton(() => ModLogsModule())
     ..registerSingleton(() => TagModule())
     ..registerSingleton(() => DocsModule())
-    ..registerSingleton(() => JellyfinModule());
+    ..registerSingleton(() => JellyfinModuleV2());
 
   await Injector.appInstance.get<DatabaseService>().init();
-  await Injector.appInstance.get<JellyfinModule>().init();
+  await Injector.appInstance.get<JellyfinModuleV2>().init();
   await Injector.appInstance.get<DocsModule>().init();
   await Injector.appInstance.get<TagModule>().init();
   await Injector.appInstance.get<ModLogsModule>().init();

diff --git a/lib/src/checks.dart b/lib/src/checks.dart
@@ -37,32 +37,6 @@ Future<(bool?, FeatureSetting?)> fetchAndCheckSetting(CommandContext context) as
   return (null, setting);
 }
 
-final jellyfinFeatureUserCommandCheck = Check(
-  (CommandContext context) async {
-    final (checkResult, setting) = await fetchAndCheckSetting(context);
-    if (checkResult != null) {
-      return checkResult;
-    }
-
-    final roleId = Snowflake.parse(setting!.dataAsJson!['user_commands_role']);
-
-    return context.member!.roleIds.contains(roleId);
-  },
-);
-
-final jellyfinFeatureAdminCommandCheck = Check(
-  (CommandContext context) async {
-    final (checkResult, setting) = await fetchAndCheckSetting(context);
-    if (checkResult != null) {
-      return checkResult;
-    }
-
-    final roleId = Snowflake.parse(setting!.dataAsJson!['admin_commands_role']);
-
-    return context.member!.roleIds.contains(roleId);
-  },
-);
-
 final jellyfinFeatureCreateInstanceCommandCheck = Check(
   (CommandContext context) async {
     final (checkResult, setting) = await fetchAndCheckSetting(context);
@@ -72,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);
   },
 );