reformat code

nyxx-discord · Dec 15, 2024 · 4f8be69 · 4f8be69
1 parent d4efb65
commit 4f8be69
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 27 deletions.
diff --git a/lib/src/web_app/api_server.dart b/lib/src/web_app/api_server.dart
@@ -42,8 +42,8 @@ class WebServer {
       return createBadRequestResponse("Missing id param");
     }
 
-    final includeRoles = request.requestedUri.queryParameters['includeRoles'] ?? null;
-    final includeChannels = request.requestedUri.queryParameters['includeChannels'] ?? null;
+    final includeRoles = request.requestedUri.queryParameters['includeRoles'];
+    final includeChannels = request.requestedUri.queryParameters['includeChannels'];
 
     try {
       final guild = await client.guilds.get(Snowflake.parse(guildParam));

diff --git a/lib/src/web_app/mapper/features_mapper.dart b/lib/src/web_app/mapper/features_mapper.dart
@@ -9,7 +9,7 @@ import 'package:running_on_dart/src/web_app/utils.dart';
 Stream<JsonApiResponse> _mapJellyfinInstances(Snowflake guildId) async* {
   final jellyfinConfigRepository = Injector.appInstance.get<JellyfinConfigRepository>();
 
-  for (final instance in await jellyfinConfigRepository.getConfigsForParent(guildId.toString()))  {
+  for (final instance in await jellyfinConfigRepository.getConfigsForParent(guildId.toString())) {
     yield {
       'id': instance.id,
       'name': instance.name,
@@ -26,12 +26,14 @@ Future<JsonApiResponse> mapGuildFeaturesToData(Snowflake guildId) async {
 
   final features = await featuresRepository.fetchSettingsForGuild(guildId);
 
-  final enabledFeaturesData = features.map((f) => {
-    'name': f.setting.name,
-    'data': f.rawData != null ? jsonDecode(f.rawData!) : null,
-    'enabledBy': f.whoEnabled.toString(),
-    'enabledAt': f.addedAt.toIso8601String(),
-  }).toList();
+  final enabledFeaturesData = features
+      .map((f) => {
+            'name': f.setting.name,
+            'data': f.rawData != null ? jsonDecode(f.rawData!) : null,
+            'enabledBy': f.whoEnabled.toString(),
+            'enabledAt': f.addedAt.toIso8601String(),
+          })
+      .toList();
 
   return {
     'enabledFeatures': enabledFeaturesData,

diff --git a/lib/src/web_app/mapper/guild_mapper.dart b/lib/src/web_app/mapper/guild_mapper.dart
@@ -95,24 +95,28 @@ Stream<JsonApiResponse> mapGuildsToGuildReducedData(Iterable<Guild> guilds) asyn
 Future<JsonApiResponse> mapGuildToDetailsData(Guild guild, String? includeRoles, String? includeChannels) async {
   final client = Injector.appInstance.get<NyxxGateway>();
 
-  final roles = includeRoles != null ? guild.roles.cache.values
-      .map((r) => {
-            "id": r.id.toString(),
-            "name": r.name.toString(),
-            "position": r.position,
-            "isHoisted": r.isHoisted,
-            "color": r.color.toHexString(),
-            "icon": r.iconHash,
-            "flags": r.flags.value,
-            "permission": r.permissions.value
-          })
-      .toList() : [];
-
-  final channels = includeChannels != null ? client.channels.cache.values
-      .whereType<GuildChannel>()
-      .where((c) => c.guildId == guild.id)
-      .map((c) => _mapChannelToData(c))
-      .toList() : [];
+  final roles = includeRoles != null
+      ? guild.roles.cache.values
+          .map((r) => {
+                "id": r.id.toString(),
+                "name": r.name.toString(),
+                "position": r.position,
+                "isHoisted": r.isHoisted,
+                "color": r.color.toHexString(),
+                "icon": r.iconHash,
+                "flags": r.flags.value,
+                "permission": r.permissions.value
+              })
+          .toList()
+      : [];
+
+  final channels = includeChannels != null
+      ? client.channels.cache.values
+          .whereType<GuildChannel>()
+          .where((c) => c.guildId == guild.id)
+          .map((c) => _mapChannelToData(c))
+          .toList()
+      : [];
 
   return {
     'id': guild.id.toString(),