Merge pull request #3 from ethanrusz/url-changes

Update Docker URL configuration
This commit is contained in:
Em (Ethan) Ruszanowski 2024-02-19 17:57:05 -05:00 committed by GitHub
commit 9121816fc6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 19 deletions

View file

@ -10,6 +10,6 @@ services:
image: git.beans.team/em/yuc:latest image: git.beans.team/em/yuc:latest
environment: environment:
- DISCORD_TOKEN=your_discord_bot_token - DISCORD_TOKEN=your_discord_bot_token
- PIPED_URL=https://your.piped.url/watch?v= - PIPED_URL=https://your.piped.url # Do not append /watch?v=
restart: unless-stopped restart: unless-stopped
``` ```

39
bot.py
View file

@ -10,10 +10,10 @@ intents = discord.Intents.default()
intents.members = True intents.members = True
intents.message_content = True intents.message_content = True
bot = commands.Bot(command_prefix='?', intents=intents) bot = commands.Bot(command_prefix="?", intents=intents)
PIPED_URL = os.getenv('PIPED_URL') PIPED_URL = os.getenv("PIPED_URL") + "/watch?v="
DISCORD_TOKEN = os.getenv('DISCORD_TOKEN') DISCORD_TOKEN = os.getenv("DISCORD_TOKEN")
@bot.event @bot.event
@ -24,7 +24,8 @@ async def on_ready():
@bot.event @bot.event
async def on_message(message): async def on_message(message):
regex = re.compile( regex = re.compile(
r'https://(music\.)?(www\.)?youtu(be)?\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&/=]*)') r"https://(music\.)?(www\.)?youtu(be)?\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&/=]*)"
)
result = regex.search(message.content) result = regex.search(message.content)
if result is not None: if result is not None:
@ -32,28 +33,30 @@ async def on_message(message):
video_id = await get_youtube_id(youtube_url) video_id = await get_youtube_id(youtube_url)
if video_id is not None: if video_id is not None:
await message.reply(f"I think you meant {PIPED_URL}{video_id}.", mention_author=False) await message.reply(
f"I think you meant {PIPED_URL}{video_id}.", mention_author=False
)
async def get_youtube_id(url: str, ignore_playlist=True) -> str: async def get_youtube_id(url: str, ignore_playlist=True) -> str:
query = urlparse(url) query = urlparse(url)
if query.hostname == 'youtu.be': if query.hostname == "youtu.be":
return query.path[1:] return query.path[1:]
if query.hostname in {'www.youtube.com', 'youtube.com', 'music.youtube.com'}: if query.hostname in {"www.youtube.com", "youtube.com", "music.youtube.com"}:
if not ignore_playlist: if not ignore_playlist:
# use case: get playlist id not current video in playlist # use case: get playlist id not current video in playlist
with suppress(KeyError): with suppress(KeyError):
return parse_qs(query.query)['list'][0] return parse_qs(query.query)["list"][0]
if query.path == '/watch': if query.path == "/watch":
return parse_qs(query.query)['v'][0] return parse_qs(query.query)["v"][0]
if query.path[:7] == '/watch/': if query.path[:7] == "/watch/":
return query.path.split('/')[1] return query.path.split("/")[1]
if query.path[:7] == '/embed/': if query.path[:7] == "/embed/":
return query.path.split('/')[2] return query.path.split("/")[2]
if query.path[:3] == '/v/': if query.path[:3] == "/v/":
return query.path.split('/')[2] return query.path.split("/")[2]
if query.path[:8] == '/shorts/': if query.path[:8] == "/shorts/":
return query.path.split('/')[1] return query.path.split("/")[1]
bot.run(DISCORD_TOKEN) bot.run(DISCORD_TOKEN)