mirrors/takahe
1
1
Fork 0
mirror of https://github.com/jointakahe/takahe.git synced 2024-11-25 16:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Preserve ellipsis class on links when re-rendering

Browse source
This commit is contained in:
Andrew Godwin 2023-02-19 23:01:50 -07:00
parent c3f5cf8d05
commit 42d6eb6000
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/html.py
View file

@ -123,6 +123,7 @@ class FediverseHtmlParser(HTMLParser):
if self._pending_a: if self._pending_a:
href = self._pending_a["attrs"].get("href") href = self._pending_a["attrs"].get("href")
content = self._pending_a["content"].strip() content = self._pending_a["content"].strip()
has_ellipsis = "ellipsis" in self._pending_a["attrs"].get("class", "")
# Is it a mention? # Is it a mention?
if content.lower().lstrip("@") in self.mention_matches: if content.lower().lstrip("@") in self.mention_matches:
self.html_output += self.create_mention(content) self.html_output += self.create_mention(content)
@ -133,7 +134,11 @@ class FediverseHtmlParser(HTMLParser):
self.text_output += content self.text_output += content
elif content: elif content:
# Shorten the link if we need to # Shorten the link if we need to
self.html_output += self.create_link(href, content) self.html_output += self.create_link(
href,
content,
has_ellipsis=has_ellipsis,
)
self.text_output += href self.text_output += href
self._pending_a = None self._pending_a = None
@ -153,7 +158,7 @@ class FediverseHtmlParser(HTMLParser):
self.html_output += self.linkify(self._data_buffer) self.html_output += self.linkify(self._data_buffer)
self._data_buffer = "" self._data_buffer = ""
def create_link(self, href, content): def create_link(self, href, content, has_ellipsis=False):
""" """
Generates a link, doing optional shortening. Generates a link, doing optional shortening.
@ -162,7 +167,7 @@ class FediverseHtmlParser(HTMLParser):
looks_like_link = bool(self.URL_REGEX.match(content)) looks_like_link = bool(self.URL_REGEX.match(content))
if looks_like_link: if looks_like_link:
content = content.split("://", 1)[1] content = content.split("://", 1)[1]
if looks_like_link and len(content) > 30: if (looks_like_link and len(content) > 30) or has_ellipsis:
return f'<a href="{html.escape(href)}" rel="nofollow" class="ellipsis" title="{html.escape(content)}">{html.escape(content[:30])}</a>' return f'<a href="{html.escape(href)}" rel="nofollow" class="ellipsis" title="{html.escape(content)}">{html.escape(content[:30])}</a>'
else: else:
return f'<a href="{html.escape(href)}" rel="nofollow">{html.escape(content)}</a>' return f'<a href="{html.escape(href)}" rel="nofollow">{html.escape(content)}</a>'