aboutsummaryrefslogtreecommitdiffstats
path: root/bot/exts/fun
diff options
context:
space:
mode:
Diffstat (limited to 'bot/exts/fun')
-rw-r--r--bot/exts/fun/anagram.py4
-rw-r--r--bot/exts/fun/battleship.py4
-rw-r--r--bot/exts/fun/fun.py4
-rw-r--r--bot/exts/fun/game.py4
-rw-r--r--bot/exts/fun/latex.py4
-rw-r--r--bot/exts/fun/magic_8ball.py4
-rw-r--r--bot/exts/fun/minesweeper.py4
-rw-r--r--bot/exts/fun/movie.py4
-rw-r--r--bot/exts/fun/quack.py4
-rw-r--r--bot/exts/fun/recommend_game.py4
-rw-r--r--bot/exts/fun/snakes/__init__.py5
-rw-r--r--bot/exts/fun/snakes/_converter.py4
-rw-r--r--bot/exts/fun/snakes/_snakes_cog.py4
-rw-r--r--bot/exts/fun/snakes/_utils.py4
-rw-r--r--bot/exts/fun/space.py4
-rw-r--r--bot/exts/fun/speedrun.py4
-rw-r--r--bot/exts/fun/trivia_quiz.py4
-rw-r--r--bot/exts/fun/xkcd.py6
18 files changed, 38 insertions, 37 deletions
diff --git a/bot/exts/fun/anagram.py b/bot/exts/fun/anagram.py
index 8210d1d5..4e23c079 100644
--- a/bot/exts/fun/anagram.py
+++ b/bot/exts/fun/anagram.py
@@ -1,16 +1,16 @@
import asyncio
import json
-import logging
import random
from pathlib import Path
import discord
from discord.ext import commands
+from pydis_core.utils.logging import get_logger
from bot.bot import Bot
from bot.constants import Colours
-log = logging.getLogger(__name__)
+log = get_logger(__name__)
TIME_LIMIT = 60
diff --git a/bot/exts/fun/battleship.py b/bot/exts/fun/battleship.py
index ded784be..a209ff02 100644
--- a/bot/exts/fun/battleship.py
+++ b/bot/exts/fun/battleship.py
@@ -1,4 +1,3 @@
-import logging
import random
import re
from dataclasses import dataclass
@@ -6,11 +5,12 @@ from functools import partial
import discord
from discord.ext import commands
+from pydis_core.utils.logging import get_logger
from bot.bot import Bot
from bot.constants import Colours
-log = logging.getLogger(__name__)
+log = get_logger(__name__)
@dataclass
diff --git a/bot/exts/fun/fun.py b/bot/exts/fun/fun.py
index 16279dd7..66c48517 100644
--- a/bot/exts/fun/fun.py
+++ b/bot/exts/fun/fun.py
@@ -1,5 +1,4 @@
import json
-import logging
import random
from collections.abc import Iterable
from pathlib import Path
@@ -10,12 +9,13 @@ from discord import Embed
from discord.ext import commands
from discord.ext.commands import BadArgument, Cog, Context
from pydis_core.utils.commands import clean_text_or_reply
+from pydis_core.utils.logging import get_logger
from bot.bot import Bot
from bot.constants import Client, Colours, Emojis
from bot.utils import helpers, messages
-log = logging.getLogger(__name__)
+log = get_logger(__name__)
def caesar_cipher(text: str, offset: int) -> Iterable[str]:
diff --git a/bot/exts/fun/game.py b/bot/exts/fun/game.py
index c9824f22..9c253ca1 100644
--- a/bot/exts/fun/game.py
+++ b/bot/exts/fun/game.py
@@ -1,5 +1,4 @@
import difflib
-import logging
import random
import re
from datetime import UTC, datetime, timedelta
@@ -11,6 +10,7 @@ from discord import Embed
from discord.ext import tasks
from discord.ext.commands import Cog, Context, group
from pydis_core.utils import scheduling
+from pydis_core.utils.logging import get_logger
from bot.bot import Bot
from bot.constants import STAFF_ROLES, Tokens
@@ -40,7 +40,7 @@ BASE_HEADERS = {
"Accept": "application/json"
}
-logger = logging.getLogger(__name__)
+logger = get_logger(__name__)
REGEX_NON_ALPHABET = re.compile(r"[^a-z0-9]", re.IGNORECASE)
diff --git a/bot/exts/fun/latex.py b/bot/exts/fun/latex.py
index b7bd708e..cd7dba11 100644
--- a/bot/exts/fun/latex.py
+++ b/bot/exts/fun/latex.py
@@ -1,5 +1,4 @@
import hashlib
-import logging
import os
import re
import string
@@ -11,12 +10,13 @@ import discord
from PIL import Image
from aiohttp import client_exceptions, web
from discord.ext import commands
+from pydis_core.utils.logging import get_logger
from bot.bot import Bot
from bot.constants import Channels, WHITELISTED_CHANNELS
from bot.utils.decorators import whitelist_override
-log = logging.getLogger(__name__)
+log = get_logger(__name__)
FORMATTED_CODE_REGEX = re.compile(
r"(?P<delim>(?P<block>```)|``?)" # code delimiter: 1-3 backticks; (?P=block) only matches if it's a block
r"(?(block)(?:(?P<lang>[a-z]+)\n)?)" # if we're in a block, match optional language (only letters plus newline)
diff --git a/bot/exts/fun/magic_8ball.py b/bot/exts/fun/magic_8ball.py
index 95d711c4..7bb3d886 100644
--- a/bot/exts/fun/magic_8ball.py
+++ b/bot/exts/fun/magic_8ball.py
@@ -1,13 +1,13 @@
import json
-import logging
import random
from pathlib import Path
from discord.ext import commands
+from pydis_core.utils.logging import get_logger
from bot.bot import Bot
-log = logging.getLogger(__name__)
+log = get_logger(__name__)
ANSWERS = json.loads(Path("bot/resources/fun/magic8ball.json").read_text("utf8"))
diff --git a/bot/exts/fun/minesweeper.py b/bot/exts/fun/minesweeper.py
index 69be88d3..29cd8ee9 100644
--- a/bot/exts/fun/minesweeper.py
+++ b/bot/exts/fun/minesweeper.py
@@ -1,10 +1,10 @@
-import logging
from collections.abc import Iterator
from dataclasses import dataclass
from random import randint, random
import discord
from discord.ext import commands
+from pydis_core.utils.logging import get_logger
from bot.bot import Bot
from bot.constants import Client
@@ -29,7 +29,7 @@ MESSAGE_MAPPING = {
"x": ":x:"
}
-log = logging.getLogger(__name__)
+log = get_logger(__name__)
GameBoard = list[list[str | int]]
diff --git a/bot/exts/fun/movie.py b/bot/exts/fun/movie.py
index 3d36b119..555c4503 100644
--- a/bot/exts/fun/movie.py
+++ b/bot/exts/fun/movie.py
@@ -1,4 +1,3 @@
-import logging
import random
from enum import Enum
from typing import Any
@@ -6,13 +5,14 @@ from typing import Any
from aiohttp import ClientSession
from discord import Embed
from discord.ext.commands import Cog, Context, group
+from pydis_core.utils.logging import get_logger
from bot.bot import Bot
from bot.constants import Tokens
from bot.utils.exceptions import APIError
from bot.utils.pagination import ImagePaginator
-logger = logging.getLogger(__name__)
+logger = get_logger(__name__)
# Define base URL of TMDB
BASE_URL = "https://api.themoviedb.org/3/"
diff --git a/bot/exts/fun/quack.py b/bot/exts/fun/quack.py
index 492e0c0f..459cb4a2 100644
--- a/bot/exts/fun/quack.py
+++ b/bot/exts/fun/quack.py
@@ -1,16 +1,16 @@
-import logging
import random
from typing import Literal
import discord
from discord.ext import commands
+from pydis_core.utils.logging import get_logger
from bot.bot import Bot
from bot.constants import Colours, NEGATIVE_REPLIES
API_URL = "https://quackstack.pythondiscord.com"
-log = logging.getLogger(__name__)
+log = get_logger(__name__)
class Quackstack(commands.Cog):
diff --git a/bot/exts/fun/recommend_game.py b/bot/exts/fun/recommend_game.py
index e972b9a5..7806ab2f 100644
--- a/bot/exts/fun/recommend_game.py
+++ b/bot/exts/fun/recommend_game.py
@@ -1,14 +1,14 @@
import json
-import logging
from pathlib import Path
from random import shuffle
import discord
from discord.ext import commands
+from pydis_core.utils.logging import get_logger
from bot.bot import Bot
-log = logging.getLogger(__name__)
+log = get_logger(__name__)
game_recs = []
# Populate the list `game_recs` with resource files
diff --git a/bot/exts/fun/snakes/__init__.py b/bot/exts/fun/snakes/__init__.py
index be71ac44..0af8ece2 100644
--- a/bot/exts/fun/snakes/__init__.py
+++ b/bot/exts/fun/snakes/__init__.py
@@ -1,10 +1,11 @@
-import logging
+
+from pydis_core.utils.logging import get_logger
from bot.bot import Bot
from bot.constants import Tokens
from bot.exts.fun.snakes._snakes_cog import Snakes
-log = logging.getLogger(__name__)
+log = get_logger(__name__)
async def setup(bot: Bot) -> None:
diff --git a/bot/exts/fun/snakes/_converter.py b/bot/exts/fun/snakes/_converter.py
index c24ba8c6..43a99a9d 100644
--- a/bot/exts/fun/snakes/_converter.py
+++ b/bot/exts/fun/snakes/_converter.py
@@ -1,16 +1,16 @@
import json
-import logging
import random
from collections.abc import Iterable
import discord
from discord.ext.commands import Context, Converter
+from pydis_core.utils.logging import get_logger
from rapidfuzz import fuzz
from bot.exts.fun.snakes._utils import SNAKE_RESOURCES
from bot.utils import disambiguate
-log = logging.getLogger(__name__)
+log = get_logger(__name__)
class Snake(Converter):
diff --git a/bot/exts/fun/snakes/_snakes_cog.py b/bot/exts/fun/snakes/_snakes_cog.py
index dfe2903a..3f0a0764 100644
--- a/bot/exts/fun/snakes/_snakes_cog.py
+++ b/bot/exts/fun/snakes/_snakes_cog.py
@@ -1,6 +1,5 @@
import asyncio
import colorsys
-import logging
import os
import random
import re
@@ -16,6 +15,7 @@ from aiohttp import ClientTimeout
from discord import Colour, Embed, File, Member, Message, Reaction
from discord.errors import HTTPException
from discord.ext.commands import Cog, CommandError, Context, bot_has_permissions, group
+from pydis_core.utils.logging import get_logger
from bot.bot import Bot
from bot.constants import ERROR_REPLIES, Tokens
@@ -23,7 +23,7 @@ from bot.exts.fun.snakes import _utils as utils
from bot.exts.fun.snakes._converter import Snake
from bot.utils.decorators import locked
-log = logging.getLogger(__name__)
+log = get_logger(__name__)
# region: Constants
diff --git a/bot/exts/fun/snakes/_utils.py b/bot/exts/fun/snakes/_utils.py
index c48ecf8d..8d24a6aa 100644
--- a/bot/exts/fun/snakes/_utils.py
+++ b/bot/exts/fun/snakes/_utils.py
@@ -1,6 +1,5 @@
import io
import json
-import logging
import math
import random
from itertools import product
@@ -10,6 +9,7 @@ from PIL import Image
from PIL.ImageDraw import ImageDraw
from discord import File, Member, Reaction, User
from discord.ext.commands import Cog, Context
+from pydis_core.utils.logging import get_logger
from bot.constants import MODERATION_ROLES
@@ -354,7 +354,7 @@ def frame_to_png_bytes(image: Image) -> io.BytesIO:
return stream
-log = logging.getLogger(__name__)
+log = get_logger(__name__)
START_EMOJI = "\u2611" # :ballot_box_with_check: - Start the game
CANCEL_EMOJI = "\u274C" # :x: - Cancel or leave the game
ROLL_EMOJI = "\U0001F3B2" # :game_die: - Roll the die!
diff --git a/bot/exts/fun/space.py b/bot/exts/fun/space.py
index 3a666bfc..f2c934bc 100644
--- a/bot/exts/fun/space.py
+++ b/bot/exts/fun/space.py
@@ -1,4 +1,3 @@
-import logging
import random
from datetime import UTC, date, datetime
from typing import Any
@@ -7,12 +6,13 @@ from urllib.parse import urlencode
from discord import Embed
from discord.ext import tasks
from discord.ext.commands import Cog, Context, group
+from pydis_core.utils.logging import get_logger
from bot.bot import Bot
from bot.constants import Tokens
from bot.utils.converters import DateConverter
-logger = logging.getLogger(__name__)
+logger = get_logger(__name__)
NASA_BASE_URL = "https://api.nasa.gov"
NASA_IMAGES_BASE_URL = "https://images-api.nasa.gov"
diff --git a/bot/exts/fun/speedrun.py b/bot/exts/fun/speedrun.py
index 43e570a2..3685b870 100644
--- a/bot/exts/fun/speedrun.py
+++ b/bot/exts/fun/speedrun.py
@@ -1,13 +1,13 @@
import json
-import logging
from pathlib import Path
from random import choice
from discord.ext import commands
+from pydis_core.utils.logging import get_logger
from bot.bot import Bot
-log = logging.getLogger(__name__)
+log = get_logger(__name__)
LINKS = json.loads(Path("bot/resources/fun/speedrun_links.json").read_text("utf8"))
diff --git a/bot/exts/fun/trivia_quiz.py b/bot/exts/fun/trivia_quiz.py
index 4f352b71..d7b49f7a 100644
--- a/bot/exts/fun/trivia_quiz.py
+++ b/bot/exts/fun/trivia_quiz.py
@@ -1,6 +1,5 @@
import asyncio
import json
-import logging
import operator
import random
import re
@@ -13,12 +12,13 @@ from pathlib import Path
import discord
from discord.ext import commands, tasks
+from pydis_core.utils.logging import get_logger
from rapidfuzz import fuzz
from bot.bot import Bot
from bot.constants import Client, Colours, MODERATION_ROLES, NEGATIVE_REPLIES
-logger = logging.getLogger(__name__)
+logger = get_logger(__name__)
DEFAULT_QUESTION_LIMIT = 7
STANDARD_VARIATION_TOLERANCE = 88
diff --git a/bot/exts/fun/xkcd.py b/bot/exts/fun/xkcd.py
index 7b34795c..df00d89d 100644
--- a/bot/exts/fun/xkcd.py
+++ b/bot/exts/fun/xkcd.py
@@ -1,15 +1,15 @@
-import logging
import re
from random import randint
from discord import Embed
from discord.ext import tasks
from discord.ext.commands import Cog, Context, command
+from pydis_core.utils.logging import get_logger
from bot.bot import Bot
from bot.constants import Colours
-log = logging.getLogger(__name__)
+log = get_logger(__name__)
COMIC_FORMAT = re.compile(r"latest|[0-9]+")
BASE_URL = "https://xkcd.com"
@@ -74,7 +74,7 @@ class XKCD(Cog):
if info["img"][-3:] in ("jpg", "png", "gif"):
embed.set_image(url=info["img"])
date = f"{info['year']}/{info['month']}/{info['day']}"
- embed.set_footer(text=f"{date} - #{info['num']}, \'{info['safe_title']}\'")
+ embed.set_footer(text=f"{date} - #{info['num']}, '{info['safe_title']}'")
embed.colour = Colours.soft_green
else:
embed.description = (
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-07 18:54:18 +0000