Skip to content

Commit

Permalink
Remove old references of TRANSPROGRAMMER_SERVER_ID
Browse files Browse the repository at this point in the history
  • Loading branch information
No767 committed Dec 30, 2023
1 parent 61d463d commit 47a8a46
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 30 deletions.
11 changes: 6 additions & 5 deletions bot/cogs/tickets.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

if TYPE_CHECKING:
from libs.utils import RoboContext

from rodhaj import Rodhaj

from rodhaj import TRANSPROGRAMMER_SERVER_ID

STAFF_ROLE = 1184257456419913798

Expand Down Expand Up @@ -97,9 +97,8 @@ async def can_close_ticket(self, ctx: RoboContext):
return False

async def can_admin_close_ticket(self, ctx: RoboContext) -> bool:
guild = self.bot.get_guild(TRANSPROGRAMMER_SERVER_ID) or (
await self.bot.fetch_guild(TRANSPROGRAMMER_SERVER_ID)
)
guild_id = self.bot.transprogrammer_guild_id
guild = self.bot.get_guild(guild_id) or (await self.bot.fetch_guild(guild_id))
staff_members = self.get_staff(guild)

if staff_members is None:
Expand Down Expand Up @@ -296,7 +295,9 @@ async def close(self, ctx: RoboContext) -> None:
owner_id = ctx.author.id
if await self.can_admin_close_ticket(ctx):
owner_id = await conn.fetchval(
get_owner_id_query, ctx.channel.id, TRANSPROGRAMMER_SERVER_ID
get_owner_id_query,
ctx.channel.id,
self.bot.transprogrammer_guild_id,
)

await self.tick_post(ctx)
Expand Down
9 changes: 5 additions & 4 deletions bot/rodhaj.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
except ImportError:
_fsw = False

TRANSPROGRAMMER_SERVER_ID = 1183302385020436480
TRANSPROGRAMMER_GUILD_ID = 1183302385020436480


class Rodhaj(commands.Bot):
Expand Down Expand Up @@ -55,6 +55,7 @@ def __init__(
self.session = session
self.partial_config: Optional[PartialConfig] = None
self.pool = pool
self.transprogrammer_guild_id = TRANSPROGRAMMER_GUILD_ID
self.version = str(VERSION)
self._dev_mode = dev_mode

Expand All @@ -73,7 +74,7 @@ async def fetch_partial_config(self) -> Optional[PartialConfig]:
FROM guild_config
WHERE id = $1;
"""
rows = await self.pool.fetchrow(query, TRANSPROGRAMMER_SERVER_ID)
rows = await self.pool.fetchrow(query, self.transprogrammer_guild_id)
if rows is None:
return None
return PartialConfig(rows)
Expand Down Expand Up @@ -143,8 +144,8 @@ async def on_message(self, message: discord.Message) -> None:
status_checklist = StatusChecklist()
tickets_cog.add_in_progress_tag(author.id, default_tags)
tickets_cog.add_status_checklist(author.id, status_checklist)
guild = self.get_guild(TRANSPROGRAMMER_SERVER_ID) or (
await self.fetch_guild(TRANSPROGRAMMER_SERVER_ID)
guild = self.get_guild(self.transprogrammer_guild_id) or (
await self.fetch_guild(self.transprogrammer_guild_id)
)

embed = discord.Embed(
Expand Down
22 changes: 1 addition & 21 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 47a8a46

Please sign in to comment.