Skip to content
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

Resolve redirects for *.page.link URLs #54

Merged
merged 1 commit into from
Nov 27, 2024
Merged

Resolve redirects for *.page.link URLs #54

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
32 changes: 25 additions & 7 deletions tg_odesli_bot/bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,23 @@ def _replace_urls_with_footnotes(
message = message.replace(url, f'[{index}]')
return message

async def _maybe_resolve_redirect(self, url: str) -> str:
"""Resolve a redirect if the URL is a short link.

For now, resolves only "*.page.link" Firebase dynamic links.

:param url: URL
:returns: resolved URL
"""
parsed = urlparse(url)
if parsed.netloc.endswith('.page.link'):
async with self.session.head(url, allow_redirects=True) as resp:
self.logger.debug(
'Resolved redirect', url=url, resolved=str(resp.url)
)
return str(resp.url)
return url

def extract_song_urls(
self, text: str, skip_youtube: bool = False
) -> list[SongUrl]:
Expand Down Expand Up @@ -321,17 +338,17 @@ def _merge_same_songs(
return merged_song_infos

async def _find_songs(
self, text: str, group_message: bool
self, text: str, is_group_message: bool
) -> tuple[SongInfo, ...]:
"""Find song info based on given text.

:param text: message text
:param group_message: text is from a group message
:param is_group_message: text is from a group message
:returns: tuple of SongInfo instances
:raise SongNotFoundError: if Odesli couldn't find any song
"""
# Extract song URLs from the message
song_urls = self.extract_song_urls(text, skip_youtube=group_message)
song_urls = self.extract_song_urls(text, skip_youtube=is_group_message)
if not song_urls:
return ()
# Get songs information by its URLs via Odesli service API
Expand Down Expand Up @@ -441,7 +458,7 @@ async def handle_inline_query(self, inline_query: InlineQuery) -> None:
await self.bot.answer_inline_query(inline_query.id, results=[])
return
try:
song_infos = await self._find_songs(query, group_message=False)
song_infos = await self._find_songs(query, is_group_message=False)
except SongNotFoundError:
reply = InputTextMessageContent(
"Sorry, Odesli couldn't find that song", parse_mode='HTML'
Expand Down Expand Up @@ -536,7 +553,7 @@ async def handle_message(self, message: types.Message):
)
try:
song_infos = await self._find_songs(
message.text, group_message=group_message
message.text, is_group_message=group_message
)
except SongNotFoundError:
await message.reply(
Expand Down Expand Up @@ -611,8 +628,9 @@ async def find_song_by_url(self, song_url: SongUrl) -> SongInfo:
:raises APIError: if Odesli API returned an error
"""
logger = self.logger_var.get()
# Normalize URL to use as a consistent cache key
normalized_url = self.normalize_url(song_url.url)
# Resolve and normalize URL to use as a consistent cache key
resolved_url = await self._maybe_resolve_redirect(song_url.url)
normalized_url = self.normalize_url(resolved_url)
params = {'url': normalized_url}
if self.config.ODESLI_API_KEY:
params['api_key'] = self.config.ODESLI_API_KEY
Expand Down