diff options
| -rw-r--r-- | bot/__main__.py | 2 | ||||
| -rw-r--r-- | bot/constants.py | 14 | ||||
| -rw-r--r-- | bot/exts/filters/antimalware.py | 6 | ||||
| -rw-r--r-- | bot/exts/recruitment/talentpool/_api.py | 14 | ||||
| -rw-r--r-- | bot/exts/utils/ping.py | 2 |
5 files changed, 16 insertions, 22 deletions
diff --git a/bot/__main__.py b/bot/__main__.py index c8843e1a3..003cbbcda 100644 --- a/bot/__main__.py +++ b/bot/__main__.py @@ -66,7 +66,7 @@ async def main() -> None: intents=intents, allowed_roles=list({discord.Object(id_) for id_ in constants.MODERATION_ROLES}), api_client=APIClient( - site_api_url=f"{constants.URLs.site_api_schema}{constants.URLs.site_api}", + site_api_url=f"{constants.URLs.site_api_scheme}{constants.URLs.site_api}", site_api_token=constants.Keys.site_api, ), ) diff --git a/bot/constants.py b/bot/constants.py index 4186472b1..67c21816a 100644 --- a/bot/constants.py +++ b/bot/constants.py @@ -527,10 +527,9 @@ class _BaseURLs(EnvConfig): github_bot_repo = "https://github.com/python-discord/bot" # Site - site = "pythondiscord.com" - site_schema = "https://" site_api = "site.default.svc.cluster.local/api" - site_api_schema = "http://" + site_api_scheme = "http://" + site_paste = "https://paste.pythondiscord.com" BaseURLs = _BaseURLs() @@ -545,13 +544,8 @@ class _URLs(_BaseURLs): connect_max_retries = 3 connect_cooldown = 5 - site_staff: str = "".join([BaseURLs.site_schema, BaseURLs.site, "/staff"]) - site_paste = "".join(["paste.", BaseURLs.site]) - - # Site endpoints - site_logs_view: str = "".join([BaseURLs.site_schema, BaseURLs.site, "/staff/bot/logs"]) - paste_service: str = "".join([BaseURLs.site_schema, "paste.", BaseURLs.site, "/{key}"]) - + paste_service: str = "".join([BaseURLs.site_paste, "/{key}"]) + site_logs_view: str = "https://pythondiscord.com/staff/bot/logs" URLs = _URLs() diff --git a/bot/exts/filters/antimalware.py b/bot/exts/filters/antimalware.py index ff39700a6..0a72a6db7 100644 --- a/bot/exts/filters/antimalware.py +++ b/bot/exts/filters/antimalware.py @@ -5,7 +5,7 @@ from discord import Embed, Message, NotFound from discord.ext.commands import Cog from bot.bot import Bot -from bot.constants import Channels, Filter, URLs +from bot.constants import BaseURLs, Channels, Filter from bot.exts.events.code_jams._channels import CATEGORY_NAME as JAM_CATEGORY_NAME from bot.log import get_logger @@ -13,13 +13,13 @@ log = get_logger(__name__) PY_EMBED_DESCRIPTION = ( "It looks like you tried to attach a Python file - " - f"please use a code-pasting service such as {URLs.site_schema}{URLs.site_paste}" + f"please use a code-pasting service such as {BaseURLs.site_paste}" ) TXT_LIKE_FILES = {".txt", ".csv", ".json"} TXT_EMBED_DESCRIPTION = ( "You either uploaded a `{blocked_extension}` file or entered a message that was too long. " - f"Please use our [paste bin]({URLs.site_schema}{URLs.site_paste}) instead." + f"Please use our [paste bin]({BaseURLs.site_paste}) instead." ) DISALLOWED_EMBED_DESCRIPTION = ( diff --git a/bot/exts/recruitment/talentpool/_api.py b/bot/exts/recruitment/talentpool/_api.py index c00c8c09c..e9e60890a 100644 --- a/bot/exts/recruitment/talentpool/_api.py +++ b/bot/exts/recruitment/talentpool/_api.py @@ -29,8 +29,8 @@ class Nomination(BaseModel): class NominationAPI: """Abstraction of site API interaction for talentpool.""" - def __init__(self, site_api: APIClient): - self.site_api = site_api + def __init__(self, site_api_client: APIClient): + self.site_api_client = site_api_client async def get_nominations( self, @@ -49,13 +49,13 @@ class NominationAPI: if user_id is not None: params["user__id"] = str(user_id) - data = await self.site_api.get("bot/nominations", params=params) + data = await self.site_api_client.get("bot/nominations", params=params) nominations = parse_obj_as(list[Nomination], data) return nominations async def get_nomination(self, nomination_id: int) -> Nomination: """Fetch a nomination by ID.""" - data = await self.site_api.get(f"bot/nominations/{nomination_id}") + data = await self.site_api_client.get(f"bot/nominations/{nomination_id}") nomination = Nomination.parse_obj(data) return nomination @@ -83,7 +83,7 @@ class NominationAPI: if thread_id is not None: data["thread_id"] = thread_id - result = await self.site_api.patch(f"bot/nominations/{nomination_id}", json=data) + result = await self.site_api_client.patch(f"bot/nominations/{nomination_id}", json=data) return Nomination.parse_obj(result) async def edit_nomination_entry( @@ -95,7 +95,7 @@ class NominationAPI: ) -> Nomination: """Edit a nomination entry.""" data = {"actor": actor_id, "reason": reason} - result = await self.site_api.patch(f"bot/nominations/{nomination_id}", json=data) + result = await self.site_api_client.patch(f"bot/nominations/{nomination_id}", json=data) return Nomination.parse_obj(result) async def post_nomination( @@ -110,5 +110,5 @@ class NominationAPI: "reason": reason, "user": user_id, } - result = await self.site_api.post("bot/nominations", json=data) + result = await self.site_api_client.post("bot/nominations", json=data) return Nomination.parse_obj(result) diff --git a/bot/exts/utils/ping.py b/bot/exts/utils/ping.py index 67a960365..20e956e03 100644 --- a/bot/exts/utils/ping.py +++ b/bot/exts/utils/ping.py @@ -38,7 +38,7 @@ class Latency(commands.Cog): bot_ping = f"{bot_ping:.{ROUND_LATENCY}f} ms" try: - async with self.bot.http_session.get(f"{URLs.site_api_schema}{URLs.site_api}/healthcheck") as request: + async with self.bot.http_session.get(f"{URLs.site_api_scheme}{URLs.site_api}/healthcheck") as request: request.raise_for_status() site_status = "Healthy" |