beenull/Moonlight
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bot hotfix

Browse source
This commit is contained in:
Spielepapagei 2023-05-04 20:40:34 +02:00
parent 74541d7f87
commit 0fde9a5005
3 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Moonlight/App/Services/DiscordBot/Commands/ServerListCommand.cs
View file

@ -1,9 +1,10 @@
using Discord;
using Discord.WebSocket;
using Logging.Net;
using Microsoft.EntityFrameworkCore;
using Moonlight.App.Database.Entities;
using Moonlight.App.Repositories;
using Moonlight.App.Repositories.Servers;
using UserStatus = Moonlight.App.Models.Misc.UserStatus;
namespace Moonlight.App.Services.DiscordBot.Commands;
@ -22,9 +23,8 @@ public class ServerListCommand : BaseModule
if (command.User.IsBot) return;
if (command.CommandName != "servers") return;
var usersRepo = Scope.ServiceProvider.GetRequiredService<UserRepository>();
var usersRepo = Scope.ServiceProvider.GetRequiredService<Repository<User>>();
var user = usersRepo.Get().FirstOrDefault(x => x.DiscordId == command.User.Id);
//var user = usersRepo.Get().FirstOrDefault(x => x.Id == 1);
if (user == null)
{
@ -42,10 +42,13 @@ public class ServerListCommand : BaseModule
foreach (var server in servers.Take(25))
{
selectOptions.Add(new SelectMenuOptionBuilder()
.WithLabel($"{server.Id} - {server.Name}")
.WithEmote(Emote.Parse("<:server3:968614410228736070>"))
.WithValue(server.Id.ToString()));
if (!server.Suspended && server.Owner.DiscordId == command.User.Id && user.Status is not (UserStatus.Banned or UserStatus.Disabled))
{
selectOptions.Add(new SelectMenuOptionBuilder()
.WithLabel($"{server.Id} - {server.Name}")
.WithEmote(Emote.Parse("<:server3:968614410228736070>"))
.WithValue(server.Id.ToString()));
}
}
components = new ComponentBuilder();

1
Moonlight/App/Services/DiscordBot/DiscordBotService.cs
View file

@ -1,6 +1,5 @@
using System.Diagnostics;
using Discord;
using Discord.Commands;
using Discord.WebSocket;
using Logging.Net;
using Moonlight.App.Services.DiscordBot.Commands;

25
Moonlight/App/Services/DiscordBot/Modules/ServerListComponentHandlerModule.cs
View file

@ -2,9 +2,11 @@
using Discord.WebSocket;
using Logging.Net;
using Microsoft.EntityFrameworkCore;
using Moonlight.App.Database.Entities;
using Moonlight.App.Models.Wings;
using Moonlight.App.Repositories;
using Moonlight.App.Repositories.Servers;
using UserStatus = Moonlight.App.Models.Misc.UserStatus;
namespace Moonlight.App.Services.DiscordBot.Modules;
@ -30,7 +32,8 @@ public class ServerListComponentHandlerModule : BaseModule
var dcs = Scope.ServiceProvider.GetRequiredService<DiscordBotService>();
var costomId = component.Data.CustomId.Split(".");
EmbedBuilder embed = dcs.EmbedBuilderModule.StandardEmbed("Something went terribly wrong! \n Mission failed please try again later.", Color.Red, component.User);
ComponentBuilder components = new();
if (costomId.Length < 3) return;
if(costomId[0] is not "Sm") return;
@ -47,11 +50,25 @@ public class ServerListComponentHandlerModule : BaseModule
await ErrorEmbedSnippet(component);
return;
}
if (server.Owner.DiscordId != component.User.Id)
var usersRepo = Scope.ServiceProvider.GetRequiredService<Repository<User>>();
var user = usersRepo.Get().FirstOrDefault(x => x.DiscordId == component.User.Id);
if (user == null)
{
embed = dcs.EmbedBuilderModule.StandardEmbed("Sorry ;( \n Please first create and/or link a Account to Discord! \n Press the Button to register/log in.", Color.Red, component.User);
components.WithButton("Click Here", style: ButtonStyle.Link, url: ConfigService.GetSection("Moonlight").GetValue<String>("AppUrl"));
await component.RespondAsync(embed: embed.Build(), components: components.Build(), ephemeral: true);
await component.DeleteOriginalResponseAsync();
return;
}
if (server.Suspended || user.Status is not (UserStatus.Banned or UserStatus.Disabled) || server.Owner.DiscordId != component.User.Id)
{
embed = dcs.EmbedBuilderModule.StandardEmbed("Is this your Server? I don't think so. \n Yes i did think of that.", Color.Red, component.User);
await component.RespondAsync(embed: embed.Build(), ephemeral: true);
await component.DeleteOriginalResponseAsync();
return;
}
@ -135,7 +152,7 @@ public class ServerListComponentHandlerModule : BaseModule
case "Stop":
if (serverDetails.State is not ("starting" or "stopping"))
if (serverDetails.State is not ("starting" or "stopping" or "running"))
{
embed = dcs.EmbedBuilderModule.StandardEmbed("Server is in a Invalid State \n please try again later.", Color.Red, component.User);
await component.RespondAsync(embed: embed.Build(), ephemeral: true);