Add Spotify support

.github/workflows/dotnet.yml

@@ -14,7 +14,24 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 0 # required for github-action-get-previous-tag
-        
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '8.0.x'
+
+    - name: Restore dependencies
+      run: dotnet restore ./Bot/Lunaris2.csproj
+
+    - name: Build
+      run: dotnet build ./Bot/Lunaris2.csproj --no-restore -c Release -o ./out
+
+    - name: Publish
+      run: dotnet publish ./Bot/Lunaris2.csproj --configuration Release --output ./out
+
+    - name: Zip the build
+      run: 7z a -tzip ./out/Lunaris.zip ./out/*
+
     - name: Get previous tag
       id: previoustag
       uses: 'WyriHaximus/github-action-get-previous-tag@v1'
@@ -27,23 +44,6 @@ jobs:
       with:
         version: ${{ steps.previoustag.outputs.tag }}
 
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '8.0.x'
-
-    - name: Restore dependencies
-      run: dotnet restore ./Bot/Lunaris2.csproj
-
-    - name: Build
-      run: dotnet build ./Bot/Lunaris2.csproj --no-restore -c Release /p:AssemblyVersion=${{ steps.previoustag.outputs.tag }} -o ./out
-
-    - name: Publish
-      run: dotnet publish ./Bot/Lunaris2.csproj --configuration Release --output ./out
-
-    - name: Zip the build
-      run: 7z a -tzip ./out/Lunaris.zip ./out/*
-
     - name: Create Release
       id: create_release
       uses: actions/create-release@v1
@@ -63,5 +63,5 @@ jobs:
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
         asset_path: ./out/Lunaris.zip
-        asset_name: Lunaris_${{steps.semver.outputs.patch}}.zip
+        asset_name: Lunaris.zip
         asset_content_type: application/zip

Bot/Handler/MessageReceivedHandler.cs

@@ -31,23 +31,21 @@ public class MessageReceivedHandler : INotificationHandler<MessageReceivedNotifi
             var servers = _client.Guilds.Select(guild => guild.Name);
             var channels = _client.Guilds
                 .SelectMany(guild => guild.VoiceChannels)
-                .Where(channel => channel.ConnectedUsers.Any(guildUser => guildUser.Id == _client.CurrentUser.Id) &&
+                .Where(channel => channel.Users.Any(user => user.IsBot));
-                                  channel.Users.Count != 1);
             
-            var statsList = new StringBuilder();
+            var table = new StringBuilder();
-            statsList.AppendLine("➡️ Servers");
+            var serverColumnWidth = 25;  // Width for server column
-            
+            var channelColumnWidth = 25; // Width for channel column
-            foreach (var server in servers) 
+            table.AppendLine($"{"Servers".PadRight(serverColumnWidth - 1)}|{"Channels".PadRight(channelColumnWidth - 1)}");
-                statsList.AppendLine($"* {server}");
+            table.AppendLine($"{new string('-', serverColumnWidth - 1)}|{new string('-', channelColumnWidth - 1)}");
-            
+            foreach (var (server, channel) in servers.Zip(channels))
-            statsList.AppendLine("➡️ Now playing channels: ");
+            {
-            
+                table.AppendLine($"{server.PadRight(serverColumnWidth - 1)}|{channel.Name.PadRight(channelColumnWidth - 1)}");
-            foreach (var channel in channels) 
+            }
-                statsList.AppendLine($"* {channel.Name} in {channel.Guild.Name}");
             
             var embed = new EmbedBuilder()
                 .WithTitle("Lunaris Statistics")
-                .WithDescription(statsList.ToString())
+                .WithDescription(table.ToString())
                 .Build();
             
             await notification.Message.Channel.SendMessageAsync(embed: embed);

Bot/Handler/MusicPlayer/PlayCommand/PlayHandler.cs

@@ -105,7 +105,7 @@ public class PlayHandler : IRequestHandler<PlayCommand>
 
                 var trackLoadOptions = new TrackLoadOptions 
                 { 
-                    SearchMode = TrackSearchMode.YouTubeMusic, 
+                    SearchMode = TrackSearchMode.YouTube, 
                 };
 
                 var trackCollection = await _audioService.Tracks.LoadTracksAsync(searchQuery, trackLoadOptions, cancellationToken: cancellationToken);
@@ -145,7 +145,7 @@ public class PlayHandler : IRequestHandler<PlayCommand>
                 else
                 {
                     // It's just a single track or a search result.
-                    var track = trackCollection.Track;
+                    var track = trackCollection.Tracks.FirstOrDefault();
     
                     if (track != null)
                     {

Bot/Lunaris2.csproj

@@ -6,7 +6,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <UserSecretsId>ec2f340f-a44c-4869-ab79-a12ba9459d80</UserSecretsId>
-    <AssemblyVersion>0.0.1337</AssemblyVersion>
   </PropertyGroup>
 
   <!--  Lavalink4net 4.0.25 seems to break the Message Module-->

Bot/Service/VoiceChannelMonitorService.cs

@@ -1,4 +1,3 @@
-using Discord;
 using Discord.WebSocket;
 
 namespace Lunaris2.Service
@@ -26,30 +25,6 @@ namespace Lunaris2.Service
         }
 
         private async Task CheckVoiceChannels()
-        {
-            SetStatus();
-            await LeaveOnAlone();
-        }
-        
-        private void SetStatus()
-        {
-            var channels = _client.Guilds
-                .SelectMany(guild => guild.VoiceChannels)
-                .Count(channel => 
-                    channel.ConnectedUsers
-                        .Any(guildUser => guildUser.Id == _client.CurrentUser.Id) && 
-                    channel.Users.Count > 1
-                );
-            
-            if (channels == 0)
-                _client.SetGameAsync(System.Reflection.Assembly.GetEntryAssembly()?.GetName().Version?.ToString(), type: ActivityType.CustomStatus);
-            else if(channels == 1)
-                _client.SetGameAsync("in 1 server", type: ActivityType.Playing);
-            else if(channels > 1)
-                _client.SetGameAsync($" in {channels} servers", type: ActivityType.Playing);
-        }
-
-        private async Task LeaveOnAlone()
         {
             foreach (var guild in _client.Guilds)
             {

application.yml

@@ -49,9 +49,12 @@ plugins:
     # Clients are queried in the order they are given (so the first client is queried first and so on...)
     clients:
       - MUSIC
+      - ANDROID_TESTSUITE
       - WEB
       - TVHTML5EMBEDDED
-      - ANDROID_TESTSUITE
+    #  name: # Name of the plugin
+    #    some_key: some_value # Some key-value pair for the plugin
+    #    another_key: another_value
 lavalink:
   plugins:
       - dependency: com.github.devoxin:lavadspx-plugin:0.0.5 # replace {VERSION} with the latest version from the "Releases" tab.