Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bugdown: Cleanup Vimeo preview.

This commit is contained in:
Vishnu Ks 2018-03-24 17:18:57 +05:30 committed by Tim Abbott
parent 7533796ea9
commit 5671cef6d0
1 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
zerver/lib/bugdown/__init__.py
View File

@ -269,26 +269,6 @@ def add_embed(root: Element, link: Text, extracted_data: Dict[Text, Any]) -> Non
description_elm.set("class", "message_embed_description") description_elm.set("class", "message_embed_description")
description_elm.text = description description_elm.text = description
def add_vimeo_preview(root: Element, link: Text, extracted_data: Dict[Text, Any], vm_id: Text) -> None:
container = markdown.util.etree.SubElement(root, "div")
container.set("class", "vimeo-video message_inline_image")
img_link = extracted_data.get('image')
if img_link:
parsed_img_link = urllib.parse.urlparse(img_link)
# Append domain where relative img_link url is given
if not parsed_img_link.netloc:
parsed_url = urllib.parse.urlparse(link)
domain = '{url.scheme}://{url.netloc}/'.format(url=parsed_url)
img_link = urllib.parse.urljoin(domain, img_link)
anchor = markdown.util.etree.SubElement(container, "a")
anchor.set("href", link)
anchor.set("target", "_blank")
anchor.set("data-id", vm_id)
anchor.set("title", link)
img = markdown.util.etree.SubElement(anchor, "img")
img.set("src", img_link)
@cache_with_key(lambda tweet_id: tweet_id, cache_name="database", with_statsd_key="tweet_data") @cache_with_key(lambda tweet_id: tweet_id, cache_name="database", with_statsd_key="tweet_data")
def fetch_tweet_data(tweet_id: Text) -> Optional[Dict[Text, Any]]: def fetch_tweet_data(tweet_id: Text) -> Optional[Dict[Text, Any]]:
if settings.TEST_SUITE: if settings.TEST_SUITE:
@ -568,13 +548,6 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
return None return None
return match.group(5) return match.group(5)
def vimeo_image(self, url: Text) -> Optional[Text]:
vm_id = self.vimeo_id(url)
if vm_id is not None:
return "http://i.vimeocdn.com/video/%s.jpg" % (vm_id,)
return None
def twitter_text(self, text: Text, def twitter_text(self, text: Text,
urls: List[Dict[Text, Text]], urls: List[Dict[Text, Text]],
user_mentions: List[Dict[Text, Any]], user_mentions: List[Dict[Text, Any]],
@ -893,16 +866,15 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
except NotFoundInCache: except NotFoundInCache:
current_message.links_for_preview.add(url) current_message.links_for_preview.add(url)
continue continue
vimeo = self.vimeo_image(url)
if extracted_data: if extracted_data:
if vimeo is not None:
vm_id = self.vimeo_id(url) vm_id = self.vimeo_id(url)
add_vimeo_preview(root, url, extracted_data, vm_id) if vm_id is not None:
continue vimeo_image = extracted_data.get('image')
if vimeo_image is not None:
add_a(root, vimeo_image, url, None, None, "vimeo-video message_inline_image", vm_id)
else: else:
add_embed(root, url, extracted_data) add_embed(root, url, extracted_data)
class Avatar(markdown.inlinepatterns.Pattern): class Avatar(markdown.inlinepatterns.Pattern):
def handleMatch(self, match: Match[Text]) -> Optional[Element]: def handleMatch(self, match: Match[Text]) -> Optional[Element]:
img = markdown.util.etree.Element('img') img = markdown.util.etree.Element('img')