diff --git a/DisCatSharp.Hosting/DiscordHostedService.cs b/DisCatSharp.Hosting/DiscordHostedService.cs
index 5ba2c0ab3..5e4126dba 100644
--- a/DisCatSharp.Hosting/DiscordHostedService.cs
+++ b/DisCatSharp.Hosting/DiscordHostedService.cs
@@ -1,158 +1,158 @@
// This file is part of the DisCatSharp project, a fork of DSharpPlus.
//
// Copyright (c) 2021 AITSYS
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using DisCatSharp.Configuration;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
namespace DisCatSharp.Hosting
{
///
/// Simple implementation for to work as a
///
public class DiscordHostedService : BackgroundService, IDiscordHostedService
{
///
public DiscordClient Client { get; private set; }
private readonly ILogger _logger;
///
public Dictionary Extensions { get; } = new();
#pragma warning disable 8618
public DiscordHostedService(IConfiguration config, ILogger logger, IServiceProvider provider)
{
this._logger = logger;
this.Initialize(config, provider);
}
#pragma warning restore 8618
///
/// Automatically search for and configure
///
///
///
private void Initialize(IConfiguration config, IServiceProvider provider)
{
var typeMap = config.FindImplementedExtensions();
this._logger.LogDebug($"Found the following config types: {string.Join("\n\t", typeMap.Keys)}");
var section = config.HasSection(Constants.LibName, "Discord")
? "Discord"
: config.HasSection(config.ConfigPath(Constants.LibName, $"Discord{Constants.ConfigSuffix}"))
? $"Discord{Constants.ConfigSuffix}"
: null;
// If not section was provided we'll still just use the default config
if (string.IsNullOrEmpty(section))
this.Client = new DiscordClient(new());
else
this.Client = new DiscordClient(config.ExtractConfig(section));
foreach (var typePair in typeMap)
try
{
// First retrieve our configuration!
object configInstance = typePair.Value.Section.ExtractConfig(() =>
ActivatorUtilities.CreateInstance(provider, typePair.Value.ConfigType));
/*
Explanation for bindings
Internal Constructors --> NonPublic
Public Constructors --> Public
Constructors --> Instance
*/
BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance;
var ctors = typePair.Value.ImplementationType.GetConstructors(flags);
object? instance;
/*
Certain extensions do not require a configuration argument
Those who do -- pass config instance in,
Those who don't -- simply instantiate
ActivatorUtilities requires a public constructor, anything with internal breaks
*/
- if (ctors.Any(x => x.GetParameters().Length == 1))
+ if (ctors.Any(x => x.GetParameters().Length == 1 && x.GetParameters().First().ParameterType == typePair.Value.ConfigType))
instance = Activator.CreateInstance(typePair.Value.ImplementationType, flags, null,
- new[] { configInstance }, null);
+ new[] { configInstance }, null);
else
instance = Activator.CreateInstance(typePair.Value.ImplementationType, true);
if (instance == null)
{
this._logger.LogError($"Unable to instantiate '{typePair.Value.ImplementationType.Name}'");
continue;
}
// Add an easy reference to our extensions for later use
this.Extensions.Add(typePair.Value.ImplementationType.Name, (BaseExtension) instance);
}
catch (Exception ex)
{
this._logger.LogError($"Unable to register '{typePair.Value.ImplementationType.Name}': \n\t{ex.Message}");
}
// Add of our extensions to our client
foreach (var extension in this.Extensions.Values)
this.Client.AddExtension(extension);
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
if (this.Client == null)
throw new NullReferenceException("Discord Client cannot be null");
await this.PreConnect();
await this.Client.ConnectAsync();
await this.PostConnect();
// Wait indefinitely -- but use stopping token so we can properly cancel if needed
await Task.Delay(-1, stoppingToken);
}
///
/// Runs just prior to the bot connecting
///
protected virtual Task PreConnect() => Task.CompletedTask;
///
/// Runs immediately after the bot connects
///
protected virtual Task PostConnect() => Task.CompletedTask;
}
}