Skip to content
This repository was archived by the owner on Oct 16, 2022. It is now read-only.

Commit 08c7970

Browse files
committed
Updated libraries, and reworked some new interface for DSharpPlus.
1 parent 8f39eb5 commit 08c7970

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

BlendoBot/BlendoBot.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Salaros.ConfigParser" Version="0.3.4" />
16+
<PackageReference Include="Salaros.ConfigParser" Version="0.3.6" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

BlendoBot/src/Program.cs

+11-11
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ public async Task<DiscordUser> GetUser(object o, ulong userId) {
308308

309309
#region Discord Client Methods
310310

311-
private async Task DiscordReady(ReadyEventArgs e) {
311+
private async Task DiscordReady(DiscordClient sender, ReadyEventArgs e) {
312312
if (Config.ActivityType.HasValue) {
313313
await DiscordClient.UpdateStatusAsync(new DiscordActivity(Config.ActivityName, Config.ActivityType.Value), UserStatus.Online, DateTime.Now);
314314
}
@@ -318,7 +318,7 @@ private async Task DiscordReady(ReadyEventArgs e) {
318318
});
319319
}
320320

321-
private async Task DiscordMessageCreated(MessageCreateEventArgs e) {
321+
private async Task DiscordMessageCreated(DiscordClient sender, MessageCreateEventArgs e) {
322322
await Task.Delay(0);
323323
// The rule is: don't react to my own messages, and commands need to be triggered with a
324324
// ? character.
@@ -359,7 +359,7 @@ private async Task DiscordMessageCreated(MessageCreateEventArgs e) {
359359
}
360360
}
361361

362-
private async Task DiscordReactionAdded(MessageReactionAddEventArgs e) {
362+
private async Task DiscordReactionAdded(DiscordClient sender, MessageReactionAddEventArgs e) {
363363
await Task.Delay(0);
364364
if (!e.User.IsCurrent && !e.User.IsBot) {
365365
if (MessageReactionListeners.TryGetValue(e.Guild.Id, out var guildMessageReactionListeners)) {
@@ -380,15 +380,15 @@ private async Task DiscordReactionAdded(MessageReactionAddEventArgs e) {
380380
}
381381
}
382382

383-
private async Task DiscordGuildCreated(GuildCreateEventArgs e) {
383+
private async Task DiscordGuildCreated(DiscordClient sender, GuildCreateEventArgs e) {
384384
Log(this, new LogEventArgs {
385385
Type = LogType.Log,
386386
Message = $"Guild created: {e.Guild.Name} ({e.Guild.Id})"
387387
});
388388

389389
await Task.Delay(0);
390390
}
391-
private async Task DiscordGuildAvailable(GuildCreateEventArgs e) {
391+
private async Task DiscordGuildAvailable(DiscordClient sender, GuildCreateEventArgs e) {
392392
Log(this, new LogEventArgs {
393393
Type = LogType.Log,
394394
Message = $"Guild available: {e.Guild.Name} ({e.Guild.Id})"
@@ -399,7 +399,7 @@ private async Task DiscordGuildAvailable(GuildCreateEventArgs e) {
399399
await Task.Delay(0);
400400
}
401401

402-
private async Task DiscordClientErrored(ClientErrorEventArgs e) {
402+
private async Task DiscordClientErrored(DiscordClient sender, ClientErrorEventArgs e) {
403403
Log(this, new LogEventArgs {
404404
Type = LogType.Error,
405405
Message = $"ClientErrored triggered: {e.Exception}"
@@ -408,15 +408,15 @@ private async Task DiscordClientErrored(ClientErrorEventArgs e) {
408408
await Task.Delay(0);
409409
}
410410

411-
private async Task DiscordSocketClosed(SocketCloseEventArgs e) {
411+
private async Task DiscordSocketClosed(DiscordClient sender, SocketCloseEventArgs e) {
412412
Log(this, new LogEventArgs {
413413
Type = LogType.Error,
414414
Message = $"SocketClosed triggered: {e.CloseCode} - {e.CloseMessage}"
415415
});
416416

417417
await Task.Delay(0);
418418
}
419-
private async Task DiscordSocketErrored(SocketErrorEventArgs e) {
419+
private async Task DiscordSocketErrored(DiscordClient sender, SocketErrorEventArgs e) {
420420
Log(this, new LogEventArgs {
421421
Type = LogType.Error,
422422
Message = $"SocketErrored triggered: {e.Exception}"
@@ -428,13 +428,13 @@ private async Task DiscordSocketErrored(SocketErrorEventArgs e) {
428428
await Task.Delay(0);
429429
}
430430

431-
private async Task DiscordHeartbeated(HeartbeatEventArgs e) {
431+
private async Task DiscordHeartbeated(DiscordClient sender, HeartbeatEventArgs e) {
432432
Log(this, new LogEventArgs {
433433
Type = LogType.Log,
434434
Message = $"Heartbeat triggered: handled = {e.Handled}, ping = {e.Ping}, timestamp = {e.Timestamp}"
435435
});
436-
HeartbeatCheck.Stop();
437-
HeartbeatCheck.Start();
436+
HeartbeatCheck?.Stop();
437+
HeartbeatCheck?.Start();
438438

439439
await Task.Delay(0);
440440
}

BlendoBotLib/BlendoBotLib.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="DSharpPlus" Version="4.0.0-nightly-00711" />
8+
<PackageReference Include="DSharpPlus" Version="4.0.0-rc1" />
99
</ItemGroup>
1010

1111
</Project>

Modules/MrPing/MrPing.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
17+
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

Modules/RemindMe/RemindMe.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.7" />
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.7" />
8+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.1" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

0 commit comments

Comments
 (0)