Skip to content

refactor(party): extract _make_party and _post_party to remove 3x copy-paste #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
psykzz merged 1 commit into from
Jun 20, 2026
+77 −112
Merged

refactor(party): extract _make_party and _post_party to remove 3x copy-paste #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 66 additions & 74 deletions party/party.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,55 @@ async def get_party(self, guild_id: int, party_id: str) -> Optional[dict]:
parties = await self.config.guild_from_id(guild_id).parties()
return parties.get(party_id)

@staticmethod
def _make_party(
party_id: str,
name: str,
author_id: int,
roles: list,
*,
description=None,
allow_multiple: bool = True,
compact: bool = False,
scheduled_time=None,
) -> dict:
"""Build a new party data dict with all required fields."""
return {
"id": party_id,
"name": name,
"description": description,
"author_id": author_id,
"roles": roles,
"signups": {role: [] for role in roles},
"allow_multiple_per_role": allow_multiple,
"allow_freeform": False,
"channel_id": None,
"message_id": None,
"scheduled_time": scheduled_time,
"compact": compact,
}

async def _post_party(
self,
guild: discord.Guild,
channel: discord.TextChannel,
party: dict,
party_id: str,
) -> discord.Message:
"""Save party to config, send embed+view, then save message/channel IDs."""
async with self.config.guild(guild).parties() as parties:
parties[party_id] = party

embed = await self.create_party_embed(party, guild)
view = PartyView(party_id, self)
message = await channel.send(embed=embed, view=view)

async with self.config.guild(guild).parties() as parties:
parties[party_id]["message_id"] = message.id
parties[party_id]["channel_id"] = channel.id

return message

async def signup_user(
self,
interaction: discord.Interaction,
Expand Down Expand Up @@ -521,43 +570,15 @@ async def modal_button_callback(interaction: discord.Interaction):
# Get guild settings
allow_multiple = await self.config.guild(ctx.guild).allow_multiple_per_role()

# Create party data
party = {
"id": party_id,
"name": name,
"description": None,
"author_id": ctx.author.id,
"roles": roles_list,
"signups": {},
"allow_multiple_per_role": allow_multiple,
"allow_freeform": False, # Only allow predefined roles
"channel_id": None,
"message_id": None,
"scheduled_time": None,
"compact": compact, # Use the compact parameter from command
}

# Initialize signups for each predefined role
for role in roles_list:
party["signups"][role] = []

# Save the party
async with self.config.guild(ctx.guild).parties() as parties:
parties[party_id] = party

# Create the party embed
embed = await self.create_party_embed(party, ctx.guild)

# Create the view with buttons
view = PartyView(party_id, self)

# Send the message
message = await ctx.send(embed=embed, view=view)

# Save the message ID and channel ID
async with self.config.guild(ctx.guild).parties() as parties:
parties[party_id]["message_id"] = message.id
parties[party_id]["channel_id"] = ctx.channel.id
party = self._make_party(
party_id,
name,
ctx.author.id,
roles_list,
allow_multiple=allow_multiple,
compact=compact,
)
await self._post_party(ctx.guild, ctx.channel, party, party_id)

# Create modlog entry
await self.create_party_modlog(
Expand Down Expand Up @@ -1205,43 +1226,14 @@ async def party_template_use(self, ctx, template_name: str, *, title: str):
# Generate a unique party ID
party_id = secrets.token_hex(4)

# Create party data
party = {
"id": party_id,
"name": title,
"description": None,
"author_id": ctx.author.id,
"roles": roles_list,
"signups": {},
"allow_multiple_per_role": allow_multiple,
"allow_freeform": False,
"channel_id": None,
"message_id": None,
"scheduled_time": None,
"compact": False, # Default to not compact
}

# Initialize signups for each predefined role
for role in roles_list:
party["signups"][role] = []

# Save the party
async with self.config.guild(ctx.guild).parties() as parties:
parties[party_id] = party

# Create the party embed
embed = await self.create_party_embed(party, ctx.guild)

# Create the view with buttons
view = PartyView(party_id, self)

# Send the message
message = await ctx.send(embed=embed, view=view)

# Save the message ID and channel ID
async with self.config.guild(ctx.guild).parties() as parties:
parties[party_id]["message_id"] = message.id
parties[party_id]["channel_id"] = ctx.channel.id
party = self._make_party(
party_id,
title,
ctx.author.id,
roles_list,
allow_multiple=allow_multiple,
)
await self._post_party(ctx.guild, ctx.channel, party, party_id)

# Create modlog entry
await self.create_party_modlog(
Expand Down
49 changes: 11 additions & 38 deletions party/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,44 +265,17 @@ async def on_submit(self, interaction: discord.Interaction):
# Generate a unique party ID
party_id = secrets.token_hex(4)

# Create party data
party = {
"id": party_id,
"name": title,
"description": description,
"author_id": interaction.user.id,
"roles": unique_roles,
"signups": {},
"allow_multiple_per_role": allow_multiple,
"allow_freeform": False,
"channel_id": None,
"message_id": None,
"scheduled_time": scheduled_time,
"compact": compact, # Use compact from settings field
}

# Initialize signups for each predefined role
for role in unique_roles:
party["signups"][role] = []

# Save the party
async with self.cog.config.guild(interaction.guild).parties() as parties:
parties[party_id] = party

# Create the party embed
embed = await self.cog.create_party_embed(party, interaction.guild)

# Create the view with buttons
view = PartyView(party_id, self.cog)

# Send the message to the channel where the interaction occurred
channel = interaction.channel
message = await channel.send(embed=embed, view=view)

# Save the message ID and channel ID
async with self.cog.config.guild(interaction.guild).parties() as parties:
parties[party_id]["message_id"] = message.id
parties[party_id]["channel_id"] = channel.id
party = self.cog._make_party(
party_id,
title,
interaction.user.id,
unique_roles,
description=description,
allow_multiple=allow_multiple,
compact=compact,
scheduled_time=scheduled_time,
)
await self.cog._post_party(interaction.guild, interaction.channel, party, party_id)

# Create modlog entry
await self.cog.create_party_modlog(
Expand Down
Loading