Skip to content

Don't set private_stream if player didn't start & rename sliced variables #102

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
CGillen merged 1 commit into from
Nov 16, 2025
Merged

Don't set private_stream if player didn't start & rename sliced variables #102

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
26 changes: 13 additions & 13 deletions bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,10 @@ async def play(interaction: discord.Interaction, url: str, private_stream: bool
if await is_cleaning_up(interaction):
raise shout_errors.CleaningUp('Bot is still cleaning up from last session')

STATE_MANAGER.set_state(interaction.guild_id, 'private_stream', private_stream)
response_message = f"Starting channel {url}" if not private_stream else "Starting channel ***OMINOUSLY***"
await interaction.response.send_message(response_message, ephemeral=True)
await play_stream(interaction, url)
if await play_stream(interaction, url):
STATE_MANAGER.set_state(interaction.guild_id, 'private_stream', private_stream)

@bot.tree.command(
name='leave',
Expand Down Expand Up @@ -671,7 +671,7 @@ def is_valid_url(url):
def url_slicer(url: str, max_display: int = 10) -> str:
"""
Return a markdown link for use in embed fields. If the Path is longer than
max_display value, return an ellipsized label that preserves the hostname and
max_display value, return an ellipsized label that preserves the hostname and
beginning of the path.

The returned string is intended to be placed directly into an embed field
Expand All @@ -680,11 +680,11 @@ def url_slicer(url: str, max_display: int = 10) -> str:
if not url:
return ""

slice = urllib.parse.urlparse(url)
sliced_url = urllib.parse.urlparse(url)
url_raw = str(url)
path_raw = slice.path.rstrip('/')
sliced_url = slice.hostname
port = slice.port
path_raw = sliced_url.path.rstrip('/')
sliced_url = sliced_url.hostname
port = sliced_url.port
# Slice the path if necessary
if len(path_raw) <= max_display:
path = path_raw
Expand All @@ -695,7 +695,7 @@ def url_slicer(url: str, max_display: int = 10) -> str:
try:
if port and int(port) not in (80, 443):
display = f"{sliced_url}:{port}{path}"
else:
else:
display = f"{sliced_url}{path}"
except Exception:
logger.warning(f"an unexpected error occurred while slicing port: {url}")
Expand Down Expand Up @@ -751,13 +751,13 @@ async def send_song_info(guild_id: int):
if bitrate not in (None, 0):
embed.add_field(name="\u200b", value=f"Source: {sliced_url} • Bitrate: {bitrate}kbps • {discord_time}", inline=True)
else:
embed.add_field(name="\u200b", value=f"Source: {sliced_url} • {discord_time}", inline=True)
embed.add_field(name="\u200b", value=f"Source: {sliced_url} • {discord_time}", inline=True)
except Exception:
# Legacy Footer fallback
logger.warning("Failed to add fields to embed, falling back to legacy footer")
embed.set_footer(text=f"Source: {url}")
return await channel.send(embed=embed)



# Retrieve information about the shoutcast stream
Expand Down Expand Up @@ -835,10 +835,10 @@ async def play_stream(interaction, url):
if not url:
logger.warning("No stream currently set, can't play nothing")
raise shout_errors.NoStreamSelected

# Handle .pls playlist files
slice = urllib.parse.urlparse(url)
path = slice.path
sliced_url = urllib.parse.urlparse(url)
path = sliced_url.path
pls = path.find('.pls')
if pls != -1:
logger.debug(f"Detected .pls file, attempting to parse: {url}")
Expand Down