mirror of
https://github.com/Myxelium/Lunaris2.0.git
synced 2026-04-13 08:00:37 +00:00
Compare commits
1 Commits
0.1.20
...
Fix-bug-wi
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cbef37c575 |
@@ -31,21 +31,23 @@ public class MessageReceivedHandler : INotificationHandler<MessageReceivedNotifi
|
|||||||
var servers = _client.Guilds.Select(guild => guild.Name);
|
var servers = _client.Guilds.Select(guild => guild.Name);
|
||||||
var channels = _client.Guilds
|
var channels = _client.Guilds
|
||||||
.SelectMany(guild => guild.VoiceChannels)
|
.SelectMany(guild => guild.VoiceChannels)
|
||||||
.Where(channel => channel.Users.Any(user => user.IsBot));
|
.Where(channel => channel.ConnectedUsers.Any(guildUser => guildUser.Id == _client.CurrentUser.Id) &&
|
||||||
|
channel.Users.Count != 1);
|
||||||
|
|
||||||
var table = new StringBuilder();
|
var statsList = new StringBuilder();
|
||||||
var serverColumnWidth = 25; // Width for server column
|
statsList.AppendLine("➡️ Servers");
|
||||||
var channelColumnWidth = 25; // Width for channel column
|
|
||||||
table.AppendLine($"{"Servers".PadRight(serverColumnWidth - 1)}|{"Channels".PadRight(channelColumnWidth - 1)}");
|
foreach (var server in servers)
|
||||||
table.AppendLine($"{new string('-', serverColumnWidth - 1)}|{new string('-', channelColumnWidth - 1)}");
|
statsList.AppendLine($"* {server}");
|
||||||
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()
|
var embed = new EmbedBuilder()
|
||||||
.WithTitle("Lunaris Statistics")
|
.WithTitle("Lunaris Statistics")
|
||||||
.WithDescription(table.ToString())
|
.WithDescription(statsList.ToString())
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
await notification.Message.Channel.SendMessageAsync(embed: embed);
|
await notification.Message.Channel.SendMessageAsync(embed: embed);
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ public class PlayHandler : IRequestHandler<PlayCommand>
|
|||||||
|
|
||||||
var trackLoadOptions = new TrackLoadOptions
|
var trackLoadOptions = new TrackLoadOptions
|
||||||
{
|
{
|
||||||
SearchMode = TrackSearchMode.YouTube,
|
SearchMode = TrackSearchMode.YouTubeMusic,
|
||||||
};
|
};
|
||||||
|
|
||||||
var trackCollection = await _audioService.Tracks.LoadTracksAsync(searchQuery, trackLoadOptions, cancellationToken: cancellationToken);
|
var trackCollection = await _audioService.Tracks.LoadTracksAsync(searchQuery, trackLoadOptions, cancellationToken: cancellationToken);
|
||||||
@@ -145,7 +145,7 @@ public class PlayHandler : IRequestHandler<PlayCommand>
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// It's just a single track or a search result.
|
// It's just a single track or a search result.
|
||||||
var track = trackCollection.Tracks.FirstOrDefault();
|
var track = trackCollection.Track;
|
||||||
|
|
||||||
if (track != null)
|
if (track != null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<UserSecretsId>ec2f340f-a44c-4869-ab79-a12ba9459d80</UserSecretsId>
|
<UserSecretsId>ec2f340f-a44c-4869-ab79-a12ba9459d80</UserSecretsId>
|
||||||
|
<AssemblyVersion>0.0.1337</AssemblyVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- Lavalink4net 4.0.25 seems to break the Message Module-->
|
<!-- Lavalink4net 4.0.25 seems to break the Message Module-->
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using Discord;
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
|
|
||||||
namespace Lunaris2.Service
|
namespace Lunaris2.Service
|
||||||
@@ -25,6 +26,30 @@ namespace Lunaris2.Service
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async Task CheckVoiceChannels()
|
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)
|
foreach (var guild in _client.Guilds)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -49,12 +49,9 @@ plugins:
|
|||||||
# Clients are queried in the order they are given (so the first client is queried first and so on...)
|
# Clients are queried in the order they are given (so the first client is queried first and so on...)
|
||||||
clients:
|
clients:
|
||||||
- MUSIC
|
- MUSIC
|
||||||
- ANDROID_TESTSUITE
|
|
||||||
- WEB
|
- WEB
|
||||||
- TVHTML5EMBEDDED
|
- TVHTML5EMBEDDED
|
||||||
# name: # Name of the plugin
|
- ANDROID_TESTSUITE
|
||||||
# some_key: some_value # Some key-value pair for the plugin
|
|
||||||
# another_key: another_value
|
|
||||||
lavalink:
|
lavalink:
|
||||||
plugins:
|
plugins:
|
||||||
- dependency: com.github.devoxin:lavadspx-plugin:0.0.5 # replace {VERSION} with the latest version from the "Releases" tab.
|
- dependency: com.github.devoxin:lavadspx-plugin:0.0.5 # replace {VERSION} with the latest version from the "Releases" tab.
|
||||||
|
|||||||
Reference in New Issue
Block a user