Fjerkroa/discord_bot
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the DMChannel support

Browse Source
This commit is contained in:
OK 2023-04-12 19:38:20 +02:00
parent 203ebe72c1
commit 4cfb6c162e
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fjerkroa_bot/discord_bot.py
View File

@ -3,12 +3,12 @@ import argparse
import toml
import discord
import logging
from discord import Message, TextChannel
from discord import Message, TextChannel, DMChannel
from discord.ext import commands
from watchdog.observers import Observer
from watchdog.events import FileSystemEventHandler
from .ai_responder import AIResponder, AIMessage
from typing import Optional
from typing import Optional, Union
class ConfigFileHandler(FileSystemEventHandler):
@ -68,7 +68,7 @@ class FjerkroaBot(commands.Bot):
async def on_message(self, message: Message) -> None:
if self.user is not None and message.author.id == self.user.id:
return
if not isinstance(message.channel, TextChannel):
if not isinstance(message.channel, (TextChannel, DMChannel)):
return
message_content = str(message.content).strip()
if len(message_content) < 1:
@ -82,8 +82,8 @@ class FjerkroaBot(commands.Bot):
def channel_by_name(self,
channel_name: Optional[str],
fallback_channel: Optional[TextChannel] = None
) -> Optional[TextChannel]:
fallback_channel: Optional[Union[TextChannel, DMChannel]] = None
) -> Optional[Union[TextChannel, DMChannel]]:
if channel_name is None:
return fallback_channel
for guild in self.guilds:
@ -92,11 +92,16 @@ class FjerkroaBot(commands.Bot):
return channel
return fallback_channel
async def respond(self, message: AIMessage, channel: TextChannel) -> None:
try:
channel_name = str(channel.name)
except Exception:
async def respond(self,
message: AIMessage,
channel: Union[TextChannel, DMChannel]) -> None:
if isinstance(channel, DMChannel):
if channel.recipient is not None:
channel_name = str(channel.recipient.name)
else:
channel_name = str(channel.id)
else:
channel_name = str(channel.name)
if channel_name in self.config.get('ignore-channels', []) and not message.direct:
logging.info(f"ignore message {repr(message)} for channel {channel_name}")
return