Skip to content

Commit f02d3d6

Browse files
Fix some issues (#5)
* Give the bot permission to read messages * Move logging out of try block * Delete message before notifying * Log message if unable to notify user
1 parent bc68259 commit f02d3d6

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

amulet_discord_bot/bot.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ async def _log(self, msg: str) -> None:
2929

3030
async def on_ready(self) -> None:
3131
try:
32-
await self._log(f"I am {os.getlogin()} and I am back")
32+
msg = f"I am {os.getlogin()} and I am back"
3333
except:
34-
await self._log("I am back")
34+
msg = "I am back"
35+
await self._log(msg)
3536

3637
async def ban(self, member: discord.Member, reason: str = "Undefined") -> None:
3738
"""Ban a user from the server"""
@@ -65,11 +66,11 @@ async def _remove_and_dm(self, message: discord.Message, dm_str: str) -> None:
6566
f"Message removed from {author.name} in {channel_name}. The warning sent to the user is as follows.\n"
6667
f"{dm_message}"
6768
)
69+
await message.delete()
6870
try:
6971
await author.send(dm_message)
70-
except:
71-
pass
72-
await message.delete()
72+
except discord.errors.Forbidden:
73+
await self._log(f"Unable to send message to {author.name}.")
7374

7475
@staticmethod
7576
def has_link(msg: str) -> bool:
@@ -177,9 +178,10 @@ async def _process_message(self, message: discord.Message) -> None:
177178
elif channel_id == Chats.ServerLog and message_text == "!ping":
178179
# alive check
179180
try:
180-
await self._log(f"Pong! {os.getlogin()}")
181+
msg = f"Pong! {os.getlogin()}"
181182
except:
182-
await self._log(f"Pong!")
183+
msg = f"Pong!"
184+
await self._log(msg)
183185
return
184186

185187
if (
@@ -244,5 +246,6 @@ def main() -> None:
244246

245247
intents = discord.Intents.default()
246248
intents.members = True
249+
intents.message_content = True
247250
client = AmuletBot(intents=intents)
248251
client.run(args.bot_token)

0 commit comments

Comments
 (0)