daan/geekbot
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Fix broken DM Channel support

Browse source
This commit is contained in:
runebaas 2020-07-15 17:10:50 +02:00
parent 5e9cb8a4c1
commit 4cd7ac1d79
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Geekbot.net/Handlers/CommandHandler.cs
View file

@ -52,7 +52,12 @@ namespace Geekbot.net.Handlers
if (!(messageParam is SocketUserMessage message)) return Task.CompletedTask; if (!(messageParam is SocketUserMessage message)) return Task.CompletedTask;
if (message.Author.IsBot) return Task.CompletedTask; if (message.Author.IsBot) return Task.CompletedTask;
var guildId = ((SocketGuildChannel) message.Channel).Guild.Id; ulong guildId = message.Author switch
{
SocketGuildUser user => user.Guild.Id,
_ => 0 // DM Channel
};
if (IsIgnoredGuild(guildId, message.Author.Id)) return Task.CompletedTask; if (IsIgnoredGuild(guildId, message.Author.Id)) return Task.CompletedTask;
var lowCaseMsg = message.ToString().ToLower(); var lowCaseMsg = message.ToString().ToLower();
@ -102,12 +107,14 @@ namespace Geekbot.net.Handlers
private bool ShouldPong(string lowerCaseMessage, ulong guildId) private bool ShouldPong(string lowerCaseMessage, ulong guildId)
{ {
if (!lowerCaseMessage.StartsWith("ping ") && !lowerCaseMessage.Equals("ping")) return false; if (!lowerCaseMessage.StartsWith("ping ") && !lowerCaseMessage.Equals("ping")) return false;
if (guildId == 0) return true;
return GetGuildSettings(guildId)?.Ping ?? false; return GetGuildSettings(guildId)?.Ping ?? false;
} }
private bool ShouldHui(string lowerCaseMessage, ulong guildId) private bool ShouldHui(string lowerCaseMessage, ulong guildId)
{ {
if (!lowerCaseMessage.StartsWith("hui")) return false; if (!lowerCaseMessage.StartsWith("hui")) return false;
if (guildId == 0) return true;
return GetGuildSettings(guildId)?.Hui ?? false; return GetGuildSettings(guildId)?.Hui ?? false;
} }