Skip to content

Improve mention parsing logic by refining escaping/unescaping methods Refactored escape_mentions logic to avoid overwriting content in every iteration, added escape_mention_starters for reuse, and improved unescape_mentions. Cleaned up inconsistencies and optimized string handling. #154

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

Open
doluk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve mention parsing logic by refining escaping/unescaping methods Refactored escape_mentions logic to avoid overwriting content in every iteration, added escape_mention_starters for reuse, and improved unescape_mentions. Cleaned up inconsistencies and optimized string handling. #154

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
54 changes: 33 additions & 21 deletions chat_exporter/parse/mention.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,25 +68,44 @@ async def flow(self):


async def escape_mentions(self):
content = ""
previous_match_end = 0
for match in re.finditer("(%s|%s|%s|%s|%s|%s|%s|%s)"
% (self.REGEX_ROLES, self.REGEX_MEMBERS, self.REGEX_CHANNELS, self.REGEX_EMOJIS,
self.REGEX_ROLES_2, self.REGEX_MEMBERS_2, self.REGEX_CHANNELS_2,
self.REGEX_EMOJIS_2), self.content):
pre_content = self.content[:match.start()]
pre_content = self.content[previous_match_end:match.start()]
post_content = self.content[match.end():]
match_content = self.content[match.start():match.end()]
match_content = await self.escape_mention_starters(match_content)

match_content = match_content.replace("<", self.ESCAPE_LT)
match_content = match_content.replace(">", self.ESCAPE_GT)
match_content = match_content.replace("&", self.ESCAPE_AMP)

self.content = pre_content + match_content + post_content
content += pre_content + match_content
previous_match_end = match.end()
if previous_match_end < len(self.content) - 1:
content += self.content[previous_match_end:]
self.content = content

async def unescape_mentions(self):
self.content = self.content.replace(self.ESCAPE_LT, "<")
self.content = self.content.replace(self.ESCAPE_GT, ">")
self.content = self.content.replace(self.ESCAPE_AMP, "&")
pass
async def unescape_mentions(self, content: str = None):
had_content = content is not None
if content is None:
content = self.content
content = content.replace(self.ESCAPE_LT, "<")
content = content.replace(self.ESCAPE_GT, ">")
content = content.replace(self.ESCAPE_AMP, "&")
if not had_content:
self.content = content
return content

async def escape_mention_starters(self, content: str = None):
had_content = content is not None
if content is None:
content = self.content
content = content.replace("<", self.ESCAPE_LT)
content = content.replace(">", self.ESCAPE_GT)
content = content.replace("&", self.ESCAPE_AMP)
if not had_content:
self.content = content
return content

async def channel_mention(self):
holder = self.REGEX_CHANNELS, self.REGEX_CHANNELS_2
Expand Down Expand Up @@ -159,7 +178,7 @@ async def member_mention(self):
member_name = member.display_name
except AttributeError:
member_name = member

member_name = await self.escape_mention_starters(member_name)
if member is not None:
replacement = '<span class="mention" title="%s">@%s</span>' \
% (str(member_id), str(member_name))
Expand All @@ -170,13 +189,11 @@ async def member_mention(self):
replacement)

match = re.search(regex, self.content)

await self.unescape_mentions()

async def time_mention(self):
holder = self.REGEX_TIME_HOLDER
timezone = pytz.timezone("UTC")

if hasattr(self.guild, "timezone"):
timezone = pytz.timezone(self.guild.timezone)

for p in holder:
regex, strf = p
Expand Down Expand Up @@ -204,11 +221,6 @@ async def time_mention(self):
ui_time = ui_time.replace(str(dt.year), str(final_year))
tooltip_time = dt.strftime("%A, %e %B %Y at %H:%M")
tooltip_time = tooltip_time.replace(str(dt.year), str(final_year))
datetime_stamp = datetime.datetime(2010, *time_stamp[1:6], tzinfo=pytz.utc)
ui_time = datetime_stamp.strftime(strf)
ui_time = ui_time.replace(str(datetime_stamp.year), str(time_stamp[0]))
tooltip_time = datetime_stamp.strftime("%A, %e %B %Y at %H:%M")
tooltip_time = tooltip_time.replace(str(datetime_stamp.year), str(time_stamp[0]))
original = match.group().replace("&lt;", "<").replace("&gt;", ">")
replacement = (
f'<span class="unix-timestamp" data-timestamp="{tooltip_time}" raw-content="{original}">'
Expand Down
Loading