Skip to content

Commit 45c6ef5

Browse files
Correct QueueEmitHandler to only emit if the config key exists. (#22)
* only add the webhook handler if the config key exists. * add webhook avatar * resolve import
1 parent 4574e33 commit 45c6ef5

File tree

4 files changed

+10
-1
lines changed

4 files changed

+10
-1
lines changed

config.template.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dsn = 'postgres://pythonistabot:pythonistabot@database:5432/pythonistabot' # ass
1616
# 10 = DEBUG
1717
[LOGGING]
1818
webhook_url = "" # optional
19+
webhook_avatar_url = "" # optional
1920
level = 20
2021

2122
[SNEKBOX] # optional

core/utils/logging.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
from discord.utils import _ColourFormatter as ColourFormatter, stream_supports_colour # type: ignore # shh, I need it
99

10+
import core
11+
1012

1113
if TYPE_CHECKING:
1214
from typing_extensions import Self
@@ -62,6 +64,7 @@ def __enter__(self: Self) -> Self:
6264
if stream_supports_colour(stream_handler):
6365
stream_handler.setFormatter(ColourFormatter())
6466
self.log.addHandler(stream_handler)
67+
if core.CONFIG["LOGGING"].get("webhook_url"):
6568
self.log.addHandler(QueueEmitHandler(self.bot))
6669

6770
return self

modules/logging.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,11 @@ async def logging_loop(self) -> None:
6161

6262
message = textwrap.shorten(f"{emoji} {format_dt(dt)}\n{to_log.message}", width=1990)
6363

64-
await self.webhook.send(message, username="PythonistaBot Logging")
64+
await self.webhook.send(
65+
message,
66+
username="PythonistaBot Logging",
67+
avatar_url=core.CONFIG["LOGGING"].get("webhook_avatar_url"),
68+
)
6569

6670

6771
async def setup(bot: core.Bot) -> None:

types_/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class Database(TypedDict):
1717

1818
class Logging(TypedDict):
1919
webhook_url: NotRequired[str]
20+
webhook_avatar_url: NotRequired[str]
2021
level: int
2122

2223

0 commit comments

Comments
 (0)