Skip to content

Add hat preview images and flip/position enhancements to hat cog #52

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 6 commits into from
Dec 5, 2025
+77 −19
Merged

Add hat preview images and flip/position enhancements to hat cog #52

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b4a529
Initial plan
Copilot Dec 5, 2025
64ae402
Add hat preview image to .hat list command
Copilot Dec 5, 2025
ce44f2a
Show preview image for every hat in .hat list command
Copilot Dec 5, 2025
bea4f16
Add flip command and allow negative position values for hat cog
Copilot Dec 5, 2025
5fed240
Update hat/hat.py
psykzz Dec 5, 2025
fd20196
Remove unnecessary blank line in hat.py
psykzz Dec 5, 2025
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
96 changes: 77 additions & 19 deletions hat/hat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
DEFAULT_ROTATION = 0
DEFAULT_X_OFFSET = 0.5 # Center horizontally (0.0 = left, 1.0 = right)
DEFAULT_Y_OFFSET = 0.0 # Top of image (0.0 = top, 1.0 = bottom)
DEFAULT_FLIP_X = False
DEFAULT_FLIP_Y = False

# Limits
MIN_SCALE = 0.1
Expand Down Expand Up @@ -45,6 +47,8 @@ def __init__(self, bot):
"rotation": DEFAULT_ROTATION,
"x_offset": DEFAULT_X_OFFSET,
"y_offset": DEFAULT_Y_OFFSET,
"flip_x": DEFAULT_FLIP_X,
"flip_y": DEFAULT_FLIP_Y,
}
self.config.register_global(**default_global)
self.config.register_user(**default_user)
Expand Down Expand Up @@ -146,6 +150,8 @@ async def _apply_hat_to_avatar(
rotation: float,
x_offset: float,
y_offset: float,
flip_x: bool = False,
flip_y: bool = False,
) -> bytes:
"""Apply a hat overlay to an avatar image."""

Expand All @@ -161,6 +167,12 @@ def process_image():
if hat.width == 0 or hat.height == 0:
raise ValueError("Invalid hat image dimensions")

# Flip the hat if requested
if flip_x:
hat = hat.transpose(Image.Transpose.FLIP_LEFT_RIGHT)
if flip_y:
hat = hat.transpose(Image.Transpose.FLIP_TOP_BOTTOM)

# Scale the hat relative to avatar width
hat_width = int(avatar_width * scale)
hat_height = int(hat.height * (hat_width / hat.width))
Expand All @@ -173,6 +185,7 @@ def process_image():
# Calculate position
# x_offset: 0.0 = left edge, 0.5 = center, 1.0 = right edge
# y_offset: 0.0 = top edge, 0.5 = center, 1.0 = bottom edge
# Negative values or values > 1.0 will position the hat partially off-screen
x = int((avatar_width - hat.width) * x_offset)
y = int((avatar_height - hat.height) * y_offset)

Expand Down Expand Up @@ -250,6 +263,8 @@ async def _send_live_preview(self, ctx, error_msg: Optional[str] = None):
user_data["rotation"],
user_data["x_offset"],
user_data["y_offset"],
user_data.get("flip_x", DEFAULT_FLIP_X),
user_data.get("flip_y", DEFAULT_FLIP_Y),
)
except Exception as e:
log.exception("Error applying hat to avatar")
Expand All @@ -258,6 +273,13 @@ async def _send_live_preview(self, ctx, error_msg: Optional[str] = None):
return

# Create embed with preview
flip_status = []
if user_data.get("flip_x", DEFAULT_FLIP_X):
flip_status.append("X")
if user_data.get("flip_y", DEFAULT_FLIP_Y):
flip_status.append("Y")
flip_text = ", ".join(flip_status) if flip_status else "None"

embed = discord.Embed(
title="🎅 Hat Preview",
description="Right-click the image to save it!",
Expand All @@ -267,7 +289,8 @@ async def _send_live_preview(self, ctx, error_msg: Optional[str] = None):
embed.add_field(name="Scale", value=f"{user_data['scale']}", inline=True)
embed.add_field(name="Rotation", value=f"{user_data['rotation']}°", inline=True)
embed.add_field(name="Position", value=f"({user_data['x_offset']}, {user_data['y_offset']})", inline=True)
embed.set_footer(text="Adjust: .hat scale, .hat rotate, .hat position | Refresh: .hat show")
embed.add_field(name="Flip", value=flip_text, inline=True)
embed.set_footer(text="Adjust: .hat scale, .hat rotate, .hat position, .hat flip | Refresh: .hat show")

file = discord.File(io.BytesIO(result), filename="hat_preview.png")
embed.set_image(url="attachment://hat_preview.png")
Expand All @@ -286,7 +309,7 @@ async def _hat(self, ctx):

@_hat.command(name="list")
async def _hat_list(self, ctx):
"""List all available hats."""
"""List all available hats with preview images."""
await self._delete_command_after_delay(ctx)

hats = await self.config.hats()
Expand All @@ -297,22 +320,28 @@ async def _hat_list(self, ctx):
self._create_cleanup_task(msg, CLEANUP_DELAY)
return

embed = discord.Embed(
title="🎅 Available Hats",
description="Use `.hat select <name>` to choose a hat!",
color=discord.Color.red(),
)
# Send a preview for each hat
hat_names = list(hats.keys())
for idx, name in enumerate(hat_names):
is_default = " ⭐" if name == default_hat else ""
is_last = idx == len(hat_names) - 1

hat_list = []
for name, data in hats.items():
is_default = "⭐ " if name == default_hat else ""
hat_list.append(f"{is_default}**{name}**")
embed = discord.Embed(
title=f"🎅 {name}{is_default}",
description="Use `.hat select <name>` to choose a hat!" if idx == 0 else None,
color=discord.Color.red(),
)

embed.add_field(name="Hats", value="\n".join(hat_list) or "None", inline=False)
embed.set_footer(text="⭐ = Default hat")
if is_last:
embed.set_footer(text="⭐ = Default hat")

msg = await ctx.send(embed=embed)
self._create_cleanup_task(msg, CLEANUP_DELAY * 3) # Keep list longer
hat_path = await self._get_hat_path(name)
if hat_path:
file = discord.File(hat_path, filename="hat_preview.png")
embed.set_image(url="attachment://hat_preview.png")
msg = await ctx.send(embed=embed, file=file)
else:
msg = await ctx.send(embed=embed)

@_hat.command(name="select")
async def _hat_select(self, ctx, hat_name: str):
Expand Down Expand Up @@ -377,25 +406,54 @@ async def _hat_position(self, ctx, x: float, y: float):
x: 0.0 = left, 0.5 = center, 1.0 = right
y: 0.0 = top, 0.5 = center, 1.0 = bottom

Negative values or values > 1.0 will position the hat partially off-screen.

Example: `.hat position 0.5 0.1`
Example: `.hat position -0.2 0.0` (hat partially off left side)
"""
if x < 0.0 or x > 1.0 or y < 0.0 or y > 1.0:
await self._send_live_preview(ctx, "❌ Position values must be between 0.0 and 1.0.")
return

await self.config.user(ctx.author).x_offset.set(x)
await self.config.user(ctx.author).y_offset.set(y)

# Show live preview
await self._send_live_preview(ctx)

@_hat.command(name="flip")
async def _hat_flip(self, ctx, axis: str):
"""Flip the hat on the X or Y axis and see a live preview.

axis: 'x' for horizontal flip, 'y' for vertical flip, 'none' to reset

Example: `.hat flip x` (flip horizontally)
Example: `.hat flip y` (flip vertically)
Example: `.hat flip none` (reset flips)
"""
axis_lower = axis.lower()
if axis_lower not in ("x", "y", "none"):
await self._send_live_preview(ctx, "❌ Axis must be 'x', 'y', or 'none'.")
return

if axis_lower == "x":
current = await self.config.user(ctx.author).flip_x()
await self.config.user(ctx.author).flip_x.set(not current)
elif axis_lower == "y":
current = await self.config.user(ctx.author).flip_y()
await self.config.user(ctx.author).flip_y.set(not current)
else: # none
await self.config.user(ctx.author).flip_x.set(DEFAULT_FLIP_X)
await self.config.user(ctx.author).flip_y.set(DEFAULT_FLIP_Y)

# Show live preview
await self._send_live_preview(ctx)

@_hat.command(name="reset")
async def _hat_reset(self, ctx):
"""Reset hat settings to defaults and see a live preview."""
await self.config.user(ctx.author).scale.set(DEFAULT_SCALE)
await self.config.user(ctx.author).rotation.set(DEFAULT_ROTATION)
await self.config.user(ctx.author).x_offset.set(DEFAULT_X_OFFSET)
await self.config.user(ctx.author).y_offset.set(DEFAULT_Y_OFFSET)
await self.config.user(ctx.author).flip_x.set(DEFAULT_FLIP_X)
await self.config.user(ctx.author).flip_y.set(DEFAULT_FLIP_Y)

# Show live preview
await self._send_live_preview(ctx)
Expand Down