liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add preliminary Sentry support

Browse Source
This commit is contained in:
Ske
2019-07-15 21:02:50 +02:00
parent 39152dbd27
commit 18e4d7c9ac
3 changed files with 72 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
PluralKit.Bot/Bot.cs
View File

@@ -16,6 +16,8 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using NodaTime;
using Npgsql;
using Sentry;
using Sentry.Extensibility;
namespace PluralKit.Bot
{
@@ -33,13 +35,19 @@ namespace PluralKit.Bot
using (var services = BuildServiceProvider())
{
var coreConfig = services.GetRequiredService<CoreConfig>();
var botConfig = services.GetRequiredService<BotConfig>();
using (SentrySdk.Init(coreConfig.SentryUrl))
{
Console.WriteLine("- Connecting to database...");
using (var conn = await services.GetRequiredService<DbConnectionFactory>().Obtain())
await Schema.CreateTables(conn);
Console.WriteLine("- Connecting to Discord...");
var client = services.GetRequiredService<IDiscordClient>() as DiscordShardedClient;
await client.LoginAsync(TokenType.Bot, services.GetRequiredService<BotConfig>().Token);
await client.LoginAsync(TokenType.Bot, botConfig.Token);
await client.StartAsync();
Console.WriteLine("- Initializing bot...");
@@ -48,6 +56,7 @@ namespace PluralKit.Bot
await Task.Delay(-1);
}
}
}
public ServiceProvider BuildServiceProvider() => new ServiceCollection()
.AddTransient(_ => _config.GetSection("PluralKit").Get<CoreConfig>() ?? new CoreConfig())
@@ -82,6 +91,8 @@ namespace PluralKit.Bot
.AddTransient<MemberStore>()
.AddTransient<MessageStore>()
.AddTransient<SwitchStore>()
.AddScoped<IHub>(_ => HubAdapter.Instance)
.BuildServiceProvider();
}
class Bot
@@ -91,13 +102,15 @@ namespace PluralKit.Bot
private CommandService _commands;
private ProxyService _proxy;
private Timer _updateTimer;
private IHub _hub;
public Bot(IServiceProvider services, IDiscordClient client, CommandService commands, ProxyService proxy)
public Bot(IServiceProvider services, IDiscordClient client, CommandService commands, ProxyService proxy, IHub hub)
{
this._services = services;
this._client = client as DiscordShardedClient;
this._commands = commands;
this._proxy = proxy;
_hub = hub;
}
public async Task Init()
@@ -158,7 +171,16 @@ namespace PluralKit.Bot
private async Task MessageReceived(SocketMessage _arg)
{
var serviceScope = _services.CreateScope();
using (SentrySdk.PushScope())
using (var serviceScope = _services.CreateScope())
{
SentrySdk.AddBreadcrumb("event.message", data: new Dictionary<string, string>()
{
{"content", _arg.Content},
{"user", _arg.Author.Id.ToString()},
{"channel", _arg.Channel.Id.ToString()},
{"guild", ((_arg.Channel as IGuildChannel)?.GuildId ?? 0).ToString()}
});
// Ignore system messages (member joined, message pinned, etc)
var arg = _arg as SocketUserMessage;
@@ -169,10 +191,13 @@ namespace PluralKit.Bot
int argPos = 0;
// Check if message starts with the command prefix
if (arg.HasStringPrefix("pk;", ref argPos, StringComparison.OrdinalIgnoreCase) || arg.HasStringPrefix("pk!", ref argPos, StringComparison.OrdinalIgnoreCase) || arg.HasMentionPrefix(_client.CurrentUser, ref argPos))
if (arg.HasStringPrefix("pk;", ref argPos, StringComparison.OrdinalIgnoreCase) ||
arg.HasStringPrefix("pk!", ref argPos, StringComparison.OrdinalIgnoreCase) ||
arg.HasMentionPrefix(_client.CurrentUser, ref argPos))
{
// Essentially move the argPos pointer by however much whitespace is at the start of the post-argPos string
var trimStartLengthDiff = arg.Content.Substring(argPos).Length - arg.Content.Substring(argPos).TrimStart().Length;
var trimStartLengthDiff = arg.Content.Substring(argPos).Length -
arg.Content.Substring(argPos).TrimStart().Length;
argPos += trimStartLengthDiff;
// If it does, fetch the sender's system (because most commands need that) into the context,
@@ -180,8 +205,11 @@ namespace PluralKit.Bot
// Note system may be null if user has no system, hence `OrDefault`
PKSystem system;
using (var conn = await serviceScope.ServiceProvider.GetService<DbConnectionFactory>().Obtain())
system = await conn.QueryFirstOrDefaultAsync<PKSystem>("select systems.* from systems, accounts where accounts.uid = @Id and systems.id = accounts.system", new { Id = arg.Author.Id });
await _commands.ExecuteAsync(new PKCommandContext(_client, arg, system), argPos, serviceScope.ServiceProvider);
system = await conn.QueryFirstOrDefaultAsync<PKSystem>(
"select systems.* from systems, accounts where accounts.uid = @Id and systems.id = accounts.system",
new {Id = arg.Author.Id});
await _commands.ExecuteAsync(new PKCommandContext(_client, arg, system), argPos,
serviceScope.ServiceProvider);
}
else
{
@@ -189,9 +217,11 @@ namespace PluralKit.Bot
await _proxy.HandleMessageAsync(arg);
}
}
}
private void HandleRuntimeError(Exception e)
{
SentrySdk.CaptureException(e);
Console.Error.WriteLine(e);
}
}

1
PluralKit.Bot/PluralKit.Bot.csproj
View File

@@ -14,6 +14,7 @@
<PackageReference Include="Discord.Net.Webhook" Version="2.0.1" />
<PackageReference Include="Discord.Net.WebSocket" Version="2.0.1" />
<PackageReference Include="Humanizer.Core" Version="2.6.2" />
<PackageReference Include="Sentry" Version="2.0.0-beta2" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0006" />
</ItemGroup>

1
PluralKit.Core/CoreConfig.cs
View File

@@ -3,5 +3,6 @@ namespace PluralKit
public class CoreConfig
{
public string Database { get; set; }
public string SentryUrl { get; set; }
}
}