Updated the web UI to use the API. Reworked the looks of web UI

This commit is contained in:
2024-12-14 17:31:36 +02:00
parent 9102cfaa47
commit 54be74b1cb
27 changed files with 227 additions and 738 deletions

View File

@@ -2,6 +2,7 @@ using System.Collections.Generic;
using System.Threading.Tasks;
using DiscordBotCore.API.Endpoints;
using DiscordBotCore.API.Endpoints.PluginManagement;
using DiscordBotCore.API.Endpoints.SettingsManagement;
using DiscordBotCore.Interfaces.API;
using DiscordBotCore.Others;
using Microsoft.AspNetCore.Builder;
@@ -25,6 +26,9 @@ public class ApiManager
AddEndpoint(new PluginListInstalledEndpoint());
AddEndpoint(new PluginInstallEndpoint());
AddEndpoint(new PluginInstallGetProgressEndpoint());
AddEndpoint(new SettingsChangeEndpoint());
AddEndpoint(new SettingsGetEndpoint());
}
public Result AddEndpoint(IEndpoint endpoint)

View File

@@ -0,0 +1,27 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using DiscordBotCore.Interfaces.API;
using DiscordBotCore.Others;
namespace DiscordBotCore.API.Endpoints.SettingsManagement;
public class SettingsChangeEndpoint : IEndpoint
{
public string Path => "/api/settings/update";
public EndpointType HttpMethod => EndpointType.Post;
public async Task<ApiResponse> HandleRequest(string? jsonRequest)
{
if (string.IsNullOrEmpty(jsonRequest))
{
return ApiResponse.Fail("Invalid json string");
}
Dictionary<string, string> jsonDictionary = await JsonManager.ConvertFromJson<Dictionary<string, string>>(jsonRequest);
foreach (var (key, value) in jsonDictionary)
{
Application.CurrentApplication.ApplicationEnvironmentVariables.Set(key, value);
}
return ApiResponse.Ok();
}
}

View File

@@ -0,0 +1,29 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using DiscordBotCore.Interfaces.API;
using DiscordBotCore.Others;
namespace DiscordBotCore.API.Endpoints.SettingsManagement;
public class SettingsGetEndpoint : IEndpoint
{
public string Path => "/api/settings/get";
public EndpointType HttpMethod => EndpointType.Get;
public async Task<ApiResponse> HandleRequest(string? jsonRequest)
{
if (string.IsNullOrEmpty(jsonRequest))
{
return ApiResponse.Fail("The json from the request was empty");
}
Dictionary<string, object> jsonSettingsDictionary = new Dictionary<string, object>()
{
{"token", Application.CurrentApplication.ApplicationEnvironmentVariables.Get("token", string.Empty)},
{"prefix", Application.CurrentApplication.ApplicationEnvironmentVariables.Get("prefix", string.Empty)},
{"ServerIDs", Application.CurrentApplication.ApplicationEnvironmentVariables.GetList("ServerIDs", new List<ulong>())}
};
string jsonResponse = await JsonManager.ConvertToJsonString(jsonSettingsDictionary);
return ApiResponse.From(jsonResponse, true);
}
}

View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
@@ -9,14 +9,38 @@
<link rel="stylesheet" href="app.css"/>
<link rel="stylesheet" href="DiscordBotWebUI.styles.css"/>
<link rel="icon" type="image/png" href="favicon.png"/>
<RadzenTheme Theme="material" @rendermode="InteractiveServer" />
<link rel="stylesheet" id="theme" href="_content/Radzen.Blazor/css/standard-dark.css"/>
<HeadOutlet/>
</head>
<body>
<Routes @rendermode="InteractiveServer"/>
<script src="_framework/blazor.web.js"></script>
<script src="_content/Radzen.Blazor/Radzen.Blazor.js?v=@(typeof(Radzen.Colors).Assembly.GetName().Version)"></script>
<script src="_content/Radzen.Blazor/Radzen.Blazor.js"></script>
</body>
</html>
</html>
@code {
[CascadingParameter]
private HttpContext HttpContext { get; set; }
[Inject]
private ThemeService ThemeService { get; set; }
protected override void OnInitialized()
{
base.OnInitialized();
if (HttpContext != null)
{
var theme = "dark";
if (!string.IsNullOrEmpty(theme))
{
ThemeService.SetTheme(theme, false);
}
}
}
}

View File

@@ -1,43 +0,0 @@
@using DiscordBotCore
@using DiscordBotCore.Plugin
@using DiscordBotWebUI.Types
<RadzenDataGrid AllowColumnResize="true" PageSize="5" AllowPaging="true" PagerHorizontalAlign="HorizontalAlign.Left" Data="ListedItems">
<Columns>
<RadzenDataGridColumn Property="@nameof(MarketItem.Name)" Title="Item Name"></RadzenDataGridColumn>
<RadzenDataGridColumn Property="@nameof(MarketItem.Author)" Title="Item Author"></RadzenDataGridColumn>
<RadzenDataGridColumn Property="@nameof(MarketItem.Description)" Title="Item Description"></RadzenDataGridColumn>
<RadzenDataGridColumn Title="Item Download">
<Template Context="item">
<RadzenButton Click="() => DownloadPlugin(item.Name)">Download</RadzenButton>
</Template>
</RadzenDataGridColumn>
</Columns>
</RadzenDataGrid>
<RadzenProgressBar Value="_ProgressValue" Visible="_ProgressBarVisible"/>
@code {
private float _ProgressValue = .0f;
private bool _ProgressBarVisible = false;
[Parameter]
public List<MarketItem> ListedItems { get; set; }
private async Task DownloadPlugin(string pluginName)
{
_ProgressBarVisible = true;
IProgress<float> downloadProgress = new Progress<float>(p => {
_ProgressValue = p;
StateHasChanged();
});
PluginOnlineInfo? pluginInfo = await Application.CurrentApplication.PluginManager.GetPluginDataByName(pluginName);
if (pluginInfo is null)
return;
await Application.CurrentApplication.PluginManager.InstallPluginWithProgressBar(pluginInfo, downloadProgress);
_ProgressBarVisible = false;
}
}

View File

@@ -1,8 +0,0 @@
@code {
[Parameter] public Action CompleteSetup { get; set; }
}
<RadzenHeading Size="H4">Final Setup</RadzenHeading>
<p>Your bot is almost ready! Click 'Finish' to complete the setup.</p>
<RadzenButton Text="Finish" Click="CompleteSetup" Style="margin-top: 20px;" />

View File

@@ -1,60 +0,0 @@
@using DiscordBotCore
@code {
[Parameter] public Action NextStep { get; set; }
private string BotToken { get; set; }
private string BotPrefix { get; set; }
private List<ulong> BotServers { get; set; }
private string BotServersString { get; set; }
private async void DoNextStep()
{
if(string.IsNullOrEmpty(BotToken) || string.IsNullOrEmpty(BotPrefix) || string.IsNullOrEmpty(BotServersString))
{
return;
}
if(BotServersString.Contains(","))
{
BotServersString = BotServersString.Replace(",", ";");
}
var stringList = BotServersString.Split(';');
BotServers = new List<ulong>();
foreach(var serverId in stringList)
{
if(ulong.TryParse(serverId, out ulong id))
{
BotServers.Add(id);
}
}
if (!BotServers.Any())
{
return;
}
Application.CurrentApplication.ApplicationEnvironmentVariables.Add("token", BotToken);
Application.CurrentApplication.ApplicationEnvironmentVariables.Add("prefix", BotPrefix);
Application.CurrentApplication.ApplicationEnvironmentVariables.Add("ServerID", BotServers);
await Application.CurrentApplication.ApplicationEnvironmentVariables.SaveToFile();
NextStep.Invoke();
}
}
<RadzenHeading Size="H4">Basic Configuration</RadzenHeading>
<p>Please provide some basic settings to get started.</p>
<RadzenLabel Text="Token" />
<RadzenTextBox @bind-Value="BotToken" Placeholder="Enter bot token here" Style="width: 100%;" />
<RadzenLabel Text="Prefix" Style="margin-top: 10px;" />
<RadzenTextBox @bind-Value="BotPrefix" Placeholder="Enter the prefix here" Style="width: 100%;" />
<RadzenLabel Text="Server Ids separated by ;" Style="margin-top: 20px;" />
<RadzenTextBox @bind-Value="BotServersString" Placeholder="Enter Server Ids here. Separated by commas (;)" Style="width: 100%;" />
<RadzenButton Text="Next" Click="DoNextStep" Style="margin-top: 30px;" />

View File

@@ -1,7 +0,0 @@
@code {
[Parameter] public Action NextStep { get; set; }
}
<RadzenHeading Size="H4">Welcome to the Bot Setup Wizard</RadzenHeading>
<p>This setup wizard will guide you through the process of configuring your bot and downloading the necessary dependencies.</p>
<RadzenButton Text="Start Setup" Click="NextStep" Style="margin-top: 20px;" />

View File

@@ -1,4 +1,5 @@
@inherits LayoutComponentBase
@inject CookieThemeService CookieThemeService
<RadzenComponents @rendermode="InteractiveServer" />
<div class="page">
@@ -7,12 +8,11 @@
</div>
<main>
<RadzenPanel Style="height: 100%; width: 100%">
<RadzenBody Expanded="true">
<article class="content px-4">
@Body
</article>
</RadzenPanel>
</RadzenBody>
</main>
</div>

View File

@@ -3,7 +3,7 @@
<div class="top-row ps-3 navbar navbar-dark">
<div class="container-fluid">
<a class="navbar-brand" href="">DiscordBotWebUI</a>
<a class="navbar-brand" href="">Seth Web Interface</a>
</div>
</div>
@@ -24,7 +24,7 @@
</div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="/market/plugins" Match="NavLinkMatch.All">
<NavLink class="nav-link" href="/plugins" Match="NavLinkMatch.All">
<span class="bi bi-database-fill" style="position: relative; top: -.75rem; font-size: 1rem;" aria-hidden="true"></span> Plugins
</NavLink>
</div>

View File

@@ -1,48 +0,0 @@
@page "/setup-wizard"
@inject DialogService DialogService
@using DiscordBotWebUI.Components.Items.Setup
@using DiscordBotWebUI.Components.Pages.SidebarPages
<RadzenCard Style="max-width: 600px; margin: auto; margin-top: 50px; padding: 20px;">
<RadzenSteps @bind-Value="currentStep" ShowStepsButtons="false">
<RadzenStepsItem Text="Welcome" />
<RadzenStepsItem Text="Basic Configuration" />
<RadzenStepsItem Text="Download Plugins" />
<RadzenStepsItem Text="Final Setup" />
</RadzenSteps>
<div>
@if (currentStep == 0)
{
<WelcomeComponent NextStep="NextStep" />
}
else if (currentStep == 1)
{
<StartupConfigurationComponent NextStep="NextStep" />
}
else if (currentStep == 2)
{
<PluginsMarket/>
}
else if (currentStep == 3)
{
<FinishSetupComponent CompleteSetup="FinishSetup" />
}
</div>
</RadzenCard>
@code {
private int currentStep = 0;
private void NextStep()
{
currentStep++;
StateHasChanged();
}
private void FinishSetup()
{
DialogService.Close(true);
}
}

View File

@@ -1,54 +1,17 @@
@page "/"
@using Discord
@using DiscordBotCore
@using DiscordBotCore.Others
@using DiscordBotWebUI.Components.Pages.Setup
@using DiscordBotWebUI.DiscordBot
@page "/"
@inject IJSRuntime JSRuntime
@inject NavigationManager NavigationManager
@inject DialogService DialogService
@inject ContextMenuService ContextMenuService
@inject TooltipService TooltipService
@inject NotificationService NotificationService
<RadzenButton readonly="@Globals.BotIsRunning" Text="Start" Click="Initialize"/>
<RadzenTextArea Placeholder="Logs..." Value="@_TextValue" Style="width: 100%; height: 80%"/>
<PageTitle>Home</PageTitle>
<RadzenRow>
<RadzenColumn Size="12">
<RadzenText Text="Home" TextStyle="TextStyle.H3" TagName="TagName.H1" />
</RadzenColumn>
</RadzenRow>
@code {
private string? _TextValue;
protected override void OnInitialized()
{
base.OnInitialized();
if (Globals.BotIsRunning)
{
_TextValue = Application.CurrentApplication.Logger.GetLogsHistory();
StateHasChanged();
}
}
private async Task Initialize()
{
if (Globals.BotIsRunning)
{
return;
}
Action<string, LogType> logging = async (str, type) => {
_TextValue += $"[{type}] {str} \n";
await InvokeAsync(StateHasChanged);
};
var discordApplication = new DiscordApplication(logging);
bool hasStarted = await discordApplication.Start();
if (!hasStarted)
{
await DialogService.OpenAsync<SetupWizard>(string.Empty, new Dictionary<string, object>());
await Initialize();
return;
}
await discordApplication.RefreshPlugins(false);
Globals.BotIsRunning = true;
await InvokeAsync(StateHasChanged);
}
}
}

View File

@@ -0,0 +1,5 @@
@page "/plugins"
@code {
}

View File

@@ -1,42 +0,0 @@
@page "/market/plugins"
@using DiscordBotCore
@using DiscordBotWebUI.Types
@using DiscordBotWebUI.Components.Items
@if(_MarketItems is null)
{
<RadzenText Text="There are no plugins available right now ..."></RadzenText>
}
@if(_MarketItems is not null && _MarketItems.Any())
{
<Marketplace ListedItems="_MarketItems"/>
}
@code {
private List<MarketItem>? _MarketItems;
protected override async Task OnInitializedAsync()
{
if(!Application.IsRunning)
{
return;
}
var plugins = await Application.CurrentApplication.PluginManager.GetPluginsList();
if(plugins is null)
{
_MarketItems = null;
return;
}
_MarketItems = new List<MarketItem>();
foreach (var onlinePlugin in plugins)
{
var marketItem = new MarketItem(onlinePlugin.Name, onlinePlugin.Author, onlinePlugin.Description);
_MarketItems.Add(marketItem);
}
}
}

View File

@@ -1,140 +1,68 @@
@page "/settings"
@using DiscordBotCore
@inject NotificationService NotificationService
@inject DialogService DialogService
@page "/settings"
@inject DialogService DialogService;
@if (Application.IsRunning)
{
<RadzenPanel>
<HeaderTemplate>
<RadzenText>Discord Bot requires a Bot Token, a prefix for normal commands and the server Ids on the servers it will be in</RadzenText>
</HeaderTemplate>
<ChildContent>
<RadzenRow>
<RadzenColumn>
<RadzenText>Discord Bot Token</RadzenText>
</RadzenColumn>
<RadzenColumn>
<RadzenTextBox Placeholder="Token..." Value="@_Token" ValueChanged="TokenValueChanged"></RadzenTextBox>
</RadzenColumn>
</RadzenRow>
<RadzenCard Style="padding: 2rem; border-radius: 8px; box-shadow: 0 2px 10px rgba(0,0,0,0.2);">
<RadzenStack Orientation="Orientation.Vertical" Gap="20px" Style="color: white;">
<RadzenLabel Text="Enter your Discord bot token below:" />
<RadzenLabel
Text="Create token here"
Component="a"
href="https://discord.com/developers/applications"
Style="display: block; margin-bottom: 0.5rem;" />
<RadzenTextBox
id="token"
Name="token"
Placeholder="Enter your token here ..."
Style="width: 100%;"
bind-Value="@TokenString" />
<RadzenLabel Text="Specify the bot's prefix:" />
<RadzenTextBox
id="prefix"
Name="prefix"
Placeholder="Enter your prefix here ..."
Style="width: 100%;"
bind-Value="@PrefixString" />
<RadzenLabel Text="Enter server IDs (separated by semicolons):" />
<RadzenTextBox
id="server"
Name="server"
Placeholder="Enter server IDs here ..."
Style="width: 100%;"
bind-Value="@ServerIdsString" />
<RadzenRow>
<RadzenColumn>
<RadzenText>Bot prefix</RadzenText>
</RadzenColumn>
<RadzenColumn>
<RadzenTextBox Placeholder="Bot prefix ..." MaxLength="1" Value="@_Prefix" ValueChanged="PrefixValueChanged"></RadzenTextBox>
</RadzenColumn>
</RadzenRow>
<RadzenRow>
<RadzenColumn>
<RadzenText>Bot Server Ids:</RadzenText>
</RadzenColumn>
<RadzenColumn>
<RadzenTextArea Placeholder="One per line ..." Value="@_ServerIds" ValueChanged="ServerIDsValueChanged"></RadzenTextArea>
</RadzenColumn>
</RadzenRow>
</ChildContent>
<FooterTemplate>
<RadzenButton Text="Save" Click="SaveChanges"></RadzenButton>
</FooterTemplate>
</RadzenPanel>
}
else
{
<RadzenText>The application is not running. Please start the application first from the Home page</RadzenText>
}
<RadzenButton Text="Save Changes" Click="SaveButtonClick" Style="margin-top: 1rem;" />
</RadzenStack>
</RadzenCard>
@code {
private string _Token = string.Empty;
private string _Prefix = string.Empty;
private string _ServerIds = string.Empty;
private string TokenString { get; set; }
private string PrefixString { get; set; }
private string ServerIdsString { get; set; }
protected override void OnInitialized()
private async void SaveButtonClick()
{
base.OnInitialized();
var response = await DialogService.Confirm("Saving this requires a bot restart.\nRestart now?", "Save Settings", new ConfirmOptions()
{
CloseDialogOnEsc = false,
ShowClose = false,
CloseDialogOnOverlayClick = false,
OkButtonText = "Restart Now",
CancelButtonText = "Don't Save"
});
if (!Application.IsRunning)
if (!response.HasValue)
{
return;
}
if(Application.CurrentApplication.ApplicationEnvironmentVariables.TryGetValue("token", out var token))
{
_Token = token as string;
}
if(Application.CurrentApplication.ApplicationEnvironmentVariables.TryGetValue("prefix", out var prefix))
{
_Prefix = prefix as string;
}
if(Application.CurrentApplication.ApplicationEnvironmentVariables.TryGetValue("ServerID", out var serverIds))
{
if (serverIds is List<object> listServerIds)
{
foreach(var item in listServerIds)
{
_ServerIds += $"{item}\n";
}
_ServerIds.TrimEnd();
}
if (!response.Value)
{
return;
}
StateHasChanged();
//TODO: Restart bot request
}
private async Task SaveChanges()
{
if (_Prefix.Length != 1)
{
DialogService.Close(false);
}
List<ulong> serverIds = new List<ulong>();
string[] values = _ServerIds.Split('\n');
foreach(var value in values)
{
string clearValue = value.TrimEnd().Replace("\r", "");
if(ulong.TryParse(clearValue, out ulong actualValue))
{
serverIds.Add(actualValue);
}
}
if (serverIds.Count == 0)
{
DialogService.Close(false);
}
Application.CurrentApplication.ApplicationEnvironmentVariables.Set("token", _Token);
Application.CurrentApplication.ApplicationEnvironmentVariables.Set("prefix", _Prefix);
Application.CurrentApplication.ApplicationEnvironmentVariables.Set("ServerID", serverIds);
await Application.CurrentApplication.ApplicationEnvironmentVariables.SaveToFile();
NotificationService.Notify(NotificationSeverity.Success, "Configuration", "Configuration has been saved !", 4000);
DialogService.Close(true);
}
private void ServerIDsValueChanged(string obj)
{
_ServerIds = obj;
}
private void PrefixValueChanged(string obj)
{
_Prefix = obj;
}
private void TokenValueChanged(string obj)
{
_Token = obj;
}
}

View File

@@ -1,92 +0,0 @@
using System.Collections.Generic;
using Discord;
using DiscordBotCore;
using DiscordBotCore.Interfaces;
using DiscordBotCore.Loaders;
using DiscordBotCore.Others;
namespace DiscordBotWebUI.DiscordBot.Commands.NormalCommands;
/// <summary>
/// The help command
/// </summary>
internal class Help: IDbCommand
{
/// <summary>
/// Command name
/// </summary>
public string Command => "help";
public List<string> Aliases => null;
/// <summary>
/// Command Description
/// </summary>
public string Description => "This command allows you to check all loaded commands";
/// <summary>
/// Command usage
/// </summary>
public string Usage => "help <command>";
/// <summary>
/// Check if the command require administrator to be executed
/// </summary>
public bool RequireAdmin => false;
/// <summary>
/// The main body of the command
/// </summary>
/// <param name="context">The command context</param>
public void ExecuteServer(DbCommandExecutingArguments args)
{
if (args.Arguments is not null)
{
var e = GenerateHelpCommand(args.Arguments[0]);
if (e is null)
args.Context.Channel.SendMessageAsync("Unknown Command " + args.Arguments[0]);
else
args.Context.Channel.SendMessageAsync(embed: e.Build());
return;
}
var embedBuilder = new EmbedBuilder();
var adminCommands = "";
var normalCommands = "";
foreach (var cmd in PluginLoader.Commands)
if (cmd.RequireAdmin)
adminCommands += cmd.Command + " ";
else
normalCommands += cmd.Command + " ";
if (adminCommands.Length > 0)
embedBuilder.AddField("Admin Commands", adminCommands);
if (normalCommands.Length > 0)
embedBuilder.AddField("Normal Commands", normalCommands);
args.Context.Channel.SendMessageAsync(embed: embedBuilder.Build());
}
private EmbedBuilder GenerateHelpCommand(string command)
{
var embedBuilder = new EmbedBuilder();
var cmd = PluginLoader.Commands.Find(p => p.Command == command ||
p.Aliases is not null && p.Aliases.Contains(command)
);
if (cmd == null) return null;
string prefix = Application.CurrentApplication.ApplicationEnvironmentVariables.Get<string>("prefix");
embedBuilder.AddField("Usage", prefix + cmd.Usage);
embedBuilder.AddField("Description", cmd.Description);
if (cmd.Aliases is null)
return embedBuilder;
embedBuilder.AddField("Alias", cmd.Aliases.Count == 0 ? "-" : string.Join(", ", cmd.Aliases));
return embedBuilder;
}
}

View File

@@ -1,64 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Discord;
using Discord.WebSocket;
using DiscordBotCore.Interfaces;
using DiscordBotCore.Loaders;
using DiscordBotCore.Others;
namespace DiscordBotWebUI.DiscordBot.Commands.SlashCommands;
public class Help: IDbSlashCommand
{
public string Name => "help";
public string Description => "This command allows you to check all loaded commands";
public bool CanUseDm => true;
public bool HasInteraction => false;
public List<SlashCommandOptionBuilder> Options =>
new()
{
new SlashCommandOptionBuilder()
.WithName("command")
.WithDescription("The command you want to get help for")
.WithRequired(false)
.WithType(ApplicationCommandOptionType.String)
};
public async void ExecuteServer(SocketSlashCommand context)
{
EmbedBuilder embedBuilder = new();
embedBuilder.WithTitle("Help Command");
var random = new Random();
Color c = new Color(random.Next(0, 255), random.Next(0, 255), random.Next(0, 255));
embedBuilder.WithColor(c);
var slashCommands = PluginLoader.SlashCommands;
var options = context.Data.Options;
//Console.WriteLine("Options: " + options.Count);
if (options is null || options.Count == 0)
foreach (var slashCommand in slashCommands)
embedBuilder.AddField(slashCommand.Name, slashCommand.Description);
if (options.Count > 0)
{
var commandName = options.First().Value;
var slashCommand = slashCommands.FirstOrDefault(x => x.Name.TrimEnd() == commandName.ToString());
if (slashCommand is null)
{
await context.RespondAsync("Unknown Command " + commandName);
return;
}
embedBuilder.AddField("DM Usable:", slashCommand.CanUseDm, true)
.WithDescription(slashCommand.Description);
}
await context.RespondAsync(embed: embedBuilder.Build());
}
}

View File

@@ -1,88 +0,0 @@
using DiscordBotCore;
using DiscordBotCore.Bot;
using DiscordBotCore.Loaders;
using DiscordBotCore.Others;
namespace DiscordBotWebUI.DiscordBot;
public class DiscordApplication
{
public bool IsRunning { get; private set; }
private Action<string, LogType> LogWriter { get; set; }
public DiscordApplication(Action<string, LogType> logWriter)
{
this.LogWriter = logWriter;
IsRunning = false;
}
private async Task<bool> LoadComponents()
{
if (!Application.IsRunning)
{
await Application.CreateApplication();
}
Application.CurrentApplication.Logger.SetOutFunction(LogWriter);
return Application.CurrentApplication.ApplicationEnvironmentVariables.ContainsKey("ServerID") &&
Application.CurrentApplication.ApplicationEnvironmentVariables.ContainsKey("token") &&
Application.CurrentApplication.ApplicationEnvironmentVariables.ContainsKey("prefix");
}
public async Task<bool> Start()
{
if (!await LoadComponents())
{
return false;
}
var token = Application.CurrentApplication.ApplicationEnvironmentVariables.Get<string>("token");
var prefix = Application.CurrentApplication.ApplicationEnvironmentVariables.Get<string>("prefix");
var coreApplication = new DiscordBotApplication(token, prefix);
await coreApplication.StartAsync();
IsRunning = true;
return true;
}
public async Task RefreshPlugins(bool quiet)
{
await LoadPlugins(quiet ? ["-q"] : null);
await InitializeInternalActionManager();
}
private async Task LoadPlugins(string[]? args)
{
var loader = new PluginLoader(Application.CurrentApplication.DiscordBotClient.Client);
if (args is not null && args.Contains("-q"))
{
await loader.LoadPlugins();
}
loader.OnCommandLoaded += (command) => {
Application.CurrentApplication.Logger.Log($"Command {command.Command} loaded successfully", LogType.Info);
};
loader.OnEventLoaded += (eEvent) => {
Application.CurrentApplication.Logger.Log($"Event {eEvent.Name} loaded successfully", LogType.Info);
};
loader.OnActionLoaded += (action) => {
Application.CurrentApplication.Logger.Log($"Action {action.ActionName} loaded successfully", LogType.Info);
};
loader.OnSlashCommandLoaded += (slashCommand) => {
Application.CurrentApplication.Logger.Log($"Slash Command {slashCommand.Name} loaded successfully", LogType.Info);
};
await loader.LoadPlugins();
}
private async Task InitializeInternalActionManager()
{
await Application.CurrentApplication.InternalActionManager.Initialize();
}
}

View File

@@ -35,6 +35,15 @@
<_ContentIncludedByDefault Remove="Data\Resources\config.json" />
<_ContentIncludedByDefault Remove="Data\Resources\plugins.json" />
<_ContentIncludedByDefault Remove="Components\Items\MarketplaceItems\MarketplaceItem.razor" />
<_ContentIncludedByDefault Remove="Components\Items\Marketplace.razor" />
<_ContentIncludedByDefault Remove="Components\Items\Setup\FinishSetupComponent.razor" />
<_ContentIncludedByDefault Remove="Components\Items\Setup\StartupConfigurationComponent.razor" />
<_ContentIncludedByDefault Remove="Components\Items\Setup\WelcomeComponent.razor" />
<_ContentIncludedByDefault Remove="Components\Pages\Setup\SetupWizard.razor" />
</ItemGroup>
<ItemGroup>
<Folder Include="Components\CustomTags\" />
</ItemGroup>
</Project>

View File

@@ -1,6 +0,0 @@
namespace DiscordBotWebUI;
public static class Globals
{
public static bool BotIsRunning { get; set; }
}

View File

@@ -1,6 +1,4 @@
using System.Reflection;
using DiscordBotWebUI.Components;
using DiscordBotWebUI.StartupActions;
using Radzen;
@@ -17,43 +15,6 @@ string logo =
";
var currentDomain = AppDomain.CurrentDomain;
currentDomain.AssemblyResolve += LoadFromSameFolder;
static Assembly LoadFromSameFolder(object sender, ResolveEventArgs args)
{
Directory.CreateDirectory("./Libraries");
string requestingAssembly = args.RequestingAssembly?.GetName().Name;
var folderPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, $"Libraries/{requestingAssembly}");
var assemblyName = new AssemblyName(args.Name).Name + ".dll";
var assemblyPath = Path.Combine(folderPath, assemblyName);
if (File.Exists(assemblyPath))
{
var fileAssembly = Assembly.LoadFrom(assemblyPath);
return fileAssembly;
}
return null;
}
// Start startup actions if any
if (args.Length > 0)
{
// get all classes that derive from IStartupAction
var startupActions = Assembly.GetExecutingAssembly()
.GetTypes()
.Where(t => t.IsSubclassOf(typeof(IStartupAction)))
.Select(t => Activator.CreateInstance(t) as IStartupAction)
.ToList();
foreach(var argument in args)
{
startupActions.FirstOrDefault(action => action?.Command == argument)?.RunAction(argument.Split(' ')[1..]);
}
}
Console.Clear();
Console.ForegroundColor = ConsoleColor.DarkYellow;
@@ -66,6 +27,12 @@ var builder = WebApplication.CreateBuilder(args);
builder.Services.AddRazorComponents()
.AddInteractiveServerComponents();
builder.Services.AddRadzenCookieThemeService(options =>
{
options.Name = "RadzenTheme"; // The name of the cookie
options.Duration = TimeSpan.FromDays(365); // The duration of the cookie
});
builder.Services.AddRadzenComponents();
var app = builder.Build();

View File

@@ -13,6 +13,7 @@
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"hotReloadEnabled": true,
"applicationUrl": "http://localhost:5255",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"

View File

@@ -1,16 +0,0 @@
namespace DiscordBotWebUI.StartupActions.Actions;
public class PurgePlugins : IStartupAction
{
public string Command => "purge_plugins";
public void RunAction(string[] args)
{
foreach (var plugin in Directory.GetFiles("./Data/Plugins", "*.dll", SearchOption.AllDirectories))
{
File.Delete(plugin);
}
File.Delete("./Data/Resources/plugins.json");
Directory.Delete("./Libraries/", true);
}
}

View File

@@ -1,20 +0,0 @@
namespace DiscordBotWebUI.StartupActions.Actions;
public class UpdateCleanup : IStartupAction
{
public string Command => "update-cleanup";
public void RunAction(string[] args)
{
List<string> files = new List<string>();
files.AddRange(Directory.GetFiles("./"));
foreach (var file in files)
{
if (file.EndsWith(".bak"))
File.Delete(file);
}
Directory.Delete("temp");
}
}

View File

@@ -1,7 +0,0 @@
namespace DiscordBotWebUI.StartupActions;
internal interface IStartupAction
{
string Command { get; }
void RunAction(string[] args);
}

View File

@@ -1,15 +0,0 @@
namespace DiscordBotWebUI.Types;
public class MarketItem
{
public string Name { get; set; }
public string Author { get; set; }
public string Description { get; set; }
public MarketItem(string name, string author, string description)
{
this.Name = name;
this.Author = author;
this.Description = description;
}
}

View File

@@ -1,3 +1,51 @@
:root {
--rz-white: #ffffff;
--rz-black: #000000;
--rz-base-50: #fafafa;
--rz-base-100: #f5f5f5;
--rz-base-200: #eeeeee;
--rz-base-300: #e0e0e0;
--rz-base-400: #bdbdbd;
--rz-base-500: #9e9e9e;
--rz-base-600: #757575;
--rz-base-700: #616161;
--rz-base-800: #424242;
--rz-base-900: #212121;
--rz-primary: #8cbe44;
--rz-primary-light: #6966db;
--rz-primary-lighter: rgba(67, 64, 210, 0.12);
--rz-primary-dark: #3633a8;
--rz-primary-darker: #2e2c8f;
--rz-secondary: #e91e63;
--rz-secondary-light: #ed4b82;
--rz-secondary-lighter: rgba(233, 30, 99, 0.12);
--rz-secondary-dark: #ba184f;
--rz-secondary-darker: #9e1443;
--rz-info: #2196f3;
--rz-info-light: #4dabf5;
--rz-info-lighter: rgba(33, 150, 243, 0.2);
--rz-info-dark: #1a78c2;
--rz-info-darker: #1666a5;
--rz-success: #4caf50;
--rz-success-light: #70bf73;
--rz-success-lighter: rgba(76, 175, 80, 0.16);
--rz-success-dark: #3d8c40;
--rz-success-darker: #347736;
--rz-warning: #ff9800;
--rz-warning-light: #ffad33;
--rz-warning-lighter: rgba(255, 152, 0, 0.2);
--rz-warning-dark: #cc7a00;
--rz-warning-darker: #ad6700;
--rz-danger: #f44336;
--rz-danger-light: #f6695e;
--rz-danger-lighter: rgba(244, 67, 54, 0.2);
--rz-danger-dark: #c3362b;
--rz-danger-darker: #a62e25;
--rz-series-1: #3700b3;
--rz-series-2: #ba68c8;
--rz-series-3: #f0;
}
html, body {
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
}