From 67dbc4c9ba137c330d26b51d45e2cde9cd7001e6 Mon Sep 17 00:00:00 2001
From: pixel <pixel+github@chrissx.de>
Date: Sat, 28 Dec 2024 07:42:23 +0100
Subject: [PATCH] =?UTF-8?q?don't=20accept=20empty=20env=20variables=20?=
 =?UTF-8?q?=F0=9F=98=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/jana.dart | 13 ++++++++-----
 pubspec.yaml  |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bin/jana.dart b/bin/jana.dart
index d07edf4..2f257e8 100644
--- a/bin/jana.dart
+++ b/bin/jana.dart
@@ -52,17 +52,20 @@ extension SendJson on TextChannel {
 }
 
 void main(List<String> argv) async {
-  final token = Platform.environment['JANA_DISCORD_TOKEN'] ?? argv.firstOrNull;
+  final env = Platform.environment;
+  final token = env['JANA_DISCORD_TOKEN']?.isNotEmpty ?? false
+      ? env['JANA_DISCORD_TOKEN']
+      : argv.firstOrNull;
   if (token == null || token.isEmpty) {
     stderr.writeln('No token provided (env JANA_DISCORD_TOKEN or pass as arg)');
     exit(1);
   }
 
-  final lavalink = Platform.environment.containsKey('JANA_LAVALINK_BASE') &&
-          Platform.environment.containsKey('JANA_LAVALINK_PASSWORD')
+  final lavalink = (env['JANA_LAVALINK_BASE']?.isNotEmpty ?? false) &&
+          (env['JANA_LAVALINK_PASSWORD']?.isNotEmpty ?? false)
       ? LavalinkPlugin(
-          base: Uri.parse(Platform.environment['JANA_LAVALINK_BASE']!),
-          password: Platform.environment['JANA_LAVALINK_PASSWORD']!,
+          base: Uri.parse(env['JANA_LAVALINK_BASE']!),
+          password: env['JANA_LAVALINK_PASSWORD']!,
         )
       : null;
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 0993031..8f8ee32 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: jana
 description: A Discord bot
-version: 2.0.0-beta.1
+version: 2.0.0-beta.2
 homepage: https://github.com/chrissxMedia/jana
 
 environment: