diff --git a/wulkabot/cogs/github.py b/wulkabot/cogs/github.py index 8850d7e..479e204 100644 --- a/wulkabot/cogs/github.py +++ b/wulkabot/cogs/github.py @@ -7,7 +7,7 @@ from discord.ext import commands from .. import bot from ..utils import github -from ..utils.constants import REPO +from ..utils.constants import GITHUB_REPO from ..utils.views import DeleteButton Repo = tuple[str, str] @@ -156,20 +156,20 @@ class GitHub(commands.Cog): try: topic = message.channel.topic # type: ignore except AttributeError: - channel_repo = REPO + channel_repo = GITHUB_REPO else: if topic is not None: channel_repo = find_repo_in_channel_topic(topic) if channel_repo is None: - channel_repo = REPO + channel_repo = GITHUB_REPO else: - channel_repo = REPO + channel_repo = GITHUB_REPO for word in words: match = parse_issue(word, default_owner=channel_repo[0], default_repo=channel_repo[1]) if match is not None: repo, issue_number = match - repo = repo or REPO + repo = repo or GITHUB_REPO try: issue = await self.github.fetch_issue(*repo, issue_number) except aiohttp.ClientResponseError: diff --git a/wulkabot/cogs/wulkanowy.py b/wulkabot/cogs/wulkanowy.py index d4d9267..b83c770 100644 --- a/wulkabot/cogs/wulkanowy.py +++ b/wulkabot/cogs/wulkanowy.py @@ -6,7 +6,7 @@ from discord.ext import commands from .. import bot from ..utils import github, wulkanowy_manager -from ..utils.constants import ACCENT_COLOR, BUILDS_CHANNEL_ID, REPO +from ..utils.constants import ACCENT_COLOR, BUILDS_CHANNEL_ID, GITHUB_REPO from ..utils.wulkanowy_manager import WulkanowyBuild, WulkanowyManagerException OTHER_DOWNLOADS = " | ".join( @@ -35,7 +35,7 @@ class Wulkanowy(commands.Cog): async def pobierz(self, interaction: discord.Interaction): await interaction.response.defer(thinking=True) - release = await self.github.fetch_latest_release(*REPO) + release = await self.github.fetch_latest_release(*GITHUB_REPO) download_urls = [] for asset in release["assets"]: name = asset["name"] @@ -43,7 +43,7 @@ class Wulkanowy(commands.Cog): download_urls.append(f"[{name}]({url})") download_urls = "\n".join(download_urls) - pulls = await self.github.fetch_open_pulls(*REPO) + pulls = await self.github.fetch_open_pulls(*GITHUB_REPO) branches = ["develop"] branches.extend((pull["head"]["ref"] for pull in pulls)) builds: list[WulkanowyBuild | WulkanowyManagerException] = await asyncio.gather( diff --git a/wulkabot/utils/constants.py b/wulkabot/utils/constants.py index c349a1f..480ae3d 100644 --- a/wulkabot/utils/constants.py +++ b/wulkabot/utils/constants.py @@ -1,4 +1,4 @@ -REPO = ("wulkanowy", "wulkanowy") +GITHUB_REPO = ("wulkanowy", "wulkanowy") ACCENT_COLOR = 0xD32F2F DEFAULT_BRANCH = "develop" -BUILDS_CHANNEL_ID = 983106478426693653 +BUILDS_CHANNEL_ID = 898126463134490664