vvzvlad/pyrogram-bridge
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Refactor PostParser to remove CSS styles and streamline reactions and views formatting

Browse Source
This commit is contained in:
vvzvlad
2025-03-27 18:58:41 +03:00
parent 50a61f2677
commit fc3fd6bb64
1 changed files with 16 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
post_parser.py
+16 -58
View File
@@ -306,42 +306,6 @@ class PostParser:
html_content = [] html_content = []
data = self.process_message(message)['html'] data = self.process_message(message)['html']
# Add CSS styles
html_content.append('''
<style>
.message-footer {
margin-top: 10px;
font-size: 0.9em;
color: #666;
}
.reactions-views {
margin-bottom: 5px;
}
.reaction {
margin-right: 5px;
}
.spacer {
display: inline-block;
width: 1em;
}
.date-links {
margin: 5px 0;
}
.date-links a {
margin-right: 1em;
color: #0088cc;
text-decoration: none;
}
.date-links a:hover {
text-decoration: underline;
}
.flags {
color: #666;
font-size: 0.9em;
}
</style>
''')
html_content.append(f'<div class="message-header">{data["header"]}</div>') html_content.append(f'<div class="message-header">{data["header"]}</div>')
html_content.append(f'<div class="message-media">{data["media"]}</div>') html_content.append(f'<div class="message-media">{data["media"]}</div>')
html_content.append(f'<div class="message-text">{data["body"]}</div>') html_content.append(f'<div class="message-text">{data["body"]}</div>')
@@ -361,7 +325,7 @@ class PostParser:
flags = self._extract_flags(message) flags = self._extract_flags(message)
if flags: if flags:
return f'<span class="flags">🏷 {", ".join(flags)}</span>' return f'🏷 {" 🏷".join(flags)}'
return '' return ''
def process_message(self, message: Message) -> Dict[Any, Any]: def process_message(self, message: Message) -> Dict[Any, Any]:
@@ -611,7 +575,6 @@ class PostParser:
try: try:
parts = [] parts = []
# First line: reactions and views
reactions_html = "" reactions_html = ""
views_html = "" views_html = ""
if reactions := getattr(message, "reactions", None): if reactions := getattr(message, "reactions", None):
@@ -619,24 +582,24 @@ class PostParser:
# Replace None or empty emoji with replacement character # Replace None or empty emoji with replacement character
emoji = reaction.emoji emoji = reaction.emoji
if emoji is None or emoji == "None" or emoji == "": if emoji is None or emoji == "None" or emoji == "":
emoji = "��" # Question mark as replacement for missing emojis emoji = "�" # Question mark as replacement for missing emojis
reactions_html += f'<span class="reaction">{emoji} {reaction.count}</span>' reactions_html += f'{emoji} {reaction.count} '
reactions_html = reactions_html.rstrip() reactions_html = reactions_html.strip()
if views := getattr(message, "views", None): if views := getattr(message, "views", None):
views_html = f'<span class="views">👁 {views}</span>' views_html = f'{views} 👁'
# Combine reactions and views with proper spacing # Combine reactions and views on the same line
if reactions_html or views_html: if reactions_html or views_html:
parts.append(f'<div class="reactions-views">{reactions_html} <span class="spacer"></span> {views_html}</div>') parts.append(f'{reactions_html} | {views_html}')
# Second line: date and links # Add date and links on the same line
second_line_parts = [] second_line_parts = []
# Format date as DD/MM/YY, HH:MM:SS # Format date as DD/MM/YY, HH:MM:SS
if message.date: if message.date:
formatted_date = message.date.strftime("%d/%m/%y, %H:%M:%S") formatted_date = message.date.strftime("%d/%m/%y, %H:%M:%S")
second_line_parts.append(f'<span class="date">{formatted_date}</span>') second_line_parts.append(formatted_date)
# Add links # Add links
channel_identifier = self.get_channel_username(message) channel_identifier = self.get_channel_username(message)
@@ -646,25 +609,20 @@ class PostParser:
if channel_identifier.startswith('-100'): # For channels with only ID if channel_identifier.startswith('-100'): # For channels with only ID
channel_id = channel_identifier[4:] # Remove '-100' prefix for web links channel_id = channel_identifier[4:] # Remove '-100' prefix for web links
links.append(f'<a href="tg://resolve?domain=c/{channel_id}&post={message.id}">Open in Telegram</a>') links.append(f'Open in Telegram')
links.append(f'<a href="https://t.me/c/{channel_id}/{message.id}">Open in Web</a>') links.append(f'Open in Web')
else: # For channels with username else: # For channels with username
links.append(f'<a href="tg://resolve?domain={channel_identifier}&post={message.id}">Open in Telegram</a>') links.append(f'Open in Telegram')
links.append(f'<a href="https://t.me/{channel_identifier}/{message.id}">Open in Web</a>') links.append(f'Open in Web')
if Config['show_bridge_link']: if Config['show_bridge_link']:
token = Config['token'] token = Config['token']
links.append(f'<a href="{base_url}/html/{channel_identifier}/{message.id}?token={token}&debug=true">Open in Bridge</a>') links.append(f'Open in Bridge')
second_line_parts.extend(links) second_line_parts.extend(links)
if second_line_parts: if second_line_parts:
spacer = " <span class=\"spacer\"></span> " parts.append(' | '.join(second_line_parts))
parts.append(f'<div class="date-links">{spacer.join(second_line_parts)}</div>')
# Third line: flags (if any) result_html = '<br>'.join(parts) if parts else None
if flags := self._format_flags(message):
parts.append(f'<div class="flags">{flags}</div>')
result_html = '\n'.join(parts) if parts else None
return self._sanitize_html(result_html) if result_html else None return self._sanitize_html(result_html) if result_html else None
except Exception as e: except Exception as e: