-
Notifications
You must be signed in to change notification settings - Fork 218
Fix rich text naked urls #238
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.
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
at-sign
wants to merge
1
commit into
hfaran:master
Choose a base branch
from
at-sign:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -100,32 +100,27 @@ def msg(self): | |
| text = self._message.get("text", "") | ||
| if not text or text.strip() == "": | ||
| text = "[ MESSAGE TEXT EMPTY ]" | ||
|
|
||
| return self._formatter.render_text(text) | ||
|
|
||
|
|
||
| def _generate_blocks_text(self, blocks): | ||
| """Build a message together from various message["blocks"]""" | ||
| text = "" | ||
| for block in blocks: | ||
| if block["type"] in ["rich_text", "rich_text_quote"]: | ||
| if block["type"] == "image": | ||
| text += self._format_block_type(block, block["type"]) | ||
| elif block["type"] in ["rich_text", "rich_text_quote"]: | ||
| for element in block["elements"]: | ||
| text += self._format_rich_text_element(element) | ||
|
|
||
| elif "fields" in block: | ||
| for field in block["fields"]: | ||
| text += self._format_block_type(field, block["type"]) | ||
|
|
||
| elif "elements" in block: | ||
| for element in block["elements"]: | ||
| text += self._format_block_type(element, block["type"]) | ||
|
|
||
| elif "type" in block and block["type"] == "divider": | ||
| text += "---\n" | ||
|
|
||
| else: | ||
| logging.warning(f"Unknown block type: {block}") | ||
|
|
||
| return text | ||
|
|
||
| def _format_rich_text_element(self, element): | ||
|
|
@@ -153,9 +148,12 @@ def _format_rich_text_element(self, element): | |
| return text | ||
|
|
||
| elif element["type"] == "link": | ||
| text = element.get('text', element['url']).replace("_", "_") | ||
| return f"<a href='{element['url']}'>{text}</a>" | ||
| text = element.get('text', "") | ||
| if not text: | ||
| text = element['url'].replace("\\/", "/") | ||
|
|
||
| text = text.replace("_", "_") | ||
| return f"<a href='{element['url']}'>{text}</a>" | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
|
||
| elif element["type"] == "user": | ||
| user = self._formatter.find_user(self.user_message(element['user_id'])) | ||
|
|
@@ -204,9 +202,6 @@ def _format_rich_text_element(self, element): | |
| logging.warning(f"Unsupported rich text element type '{element['type']}' for {element}") | ||
| return "" | ||
|
|
||
|
|
||
|
|
||
|
|
||
| def _format_block_type(self, text_obj, b_type): | ||
| """Format the text based on the block type""" | ||
| if b_type == "image": | ||
|
|
@@ -260,30 +255,6 @@ def _format_block_type(self, text_obj, b_type): | |
| return f"unsupported_block({b_type}: {text_obj}\n\n)" | ||
|
|
||
|
|
||
|
|
||
| def _generate_blocks_text(self, blocks): | ||
| """Build a message together from various message["blocks"]""" | ||
| text = "" | ||
| for block in blocks: | ||
| if block["type"] == "image": | ||
| text += self._format_block_type(block, block["type"]) | ||
| elif block["type"] in ["rich_text", "rich_text_quote"]: | ||
| for element in block["elements"]: | ||
| text += self._format_rich_text_element(element) | ||
| elif "fields" in block: | ||
| for field in block["fields"]: | ||
| text += self._format_block_type(field, block["type"]) | ||
| elif "elements" in block: | ||
| for element in block["elements"]: | ||
| text += self._format_block_type(element, block["type"]) | ||
| elif "type" in block and block["type"] == "divider": | ||
| text += "---\n" | ||
| else: | ||
| logging.warning(f"Unknown block type: {block}") | ||
| return text | ||
|
|
||
|
|
||
|
|
||
| def user_message(self, user_id): | ||
| return {"user": user_id} | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be worth adding the following explanation as a comment above this:
Slack's block kit JSON sometimes encodes forward slashes as/(a valid JSON escape). Python'sjsonmodule may leave these as literal backslash+slash depending on the serialiser, so this replacement normalises them before using the URL as display text.