github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-26 23:39:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't check media embeds for validity. (Instead cleaned up the ones in production by hand)

Browse Source
This commit is contained in:
ketralnis
2009-07-27 14:35:14 -07:00
parent 52319ba5ab
commit ac263fba6f
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
r2/r2/lib/pages/pages.py
View File

@@ -1487,22 +1487,17 @@ class MediaChild(LinkChild):
objects, like embedded videos"""
css_style = "video"
def valid(self):
return ('type' in self.link.media_object
and self.link.media_object['type'] in scrapers)
def content(self):
if isinstance(self.link.media_object, basestring):
return self.link.media_object
if self.valid():
scraper = scrapers[self.link.media_object['type']]
media_embed = scraper.media_embed(**self.link.media_object)
return MediaEmbed(media_domain = g.media_domain,
height = media_embed.height+10,
width = media_embed.width+10,
scrolling = media_embed.scrolling,
id36 = self.link._id36).render()
scraper = scrapers[self.link.media_object['type']]
media_embed = scraper.media_embed(**self.link.media_object)
return MediaEmbed(media_domain = g.media_domain,
height = media_embed.height+10,
width = media_embed.width+10,
scrolling = media_embed.scrolling,
id36 = self.link._id36).render()
class MediaEmbed(Templated):
"""The actual rendered iframe for a media child"""

4
r2/r2/models/link.py
View File

@@ -337,9 +337,7 @@ class Link(Thing, Printable):
item.link_child = None
item.editable = False
if item.media_object:
link_child = MediaChild(item, load = True)
if link_child.valid():
item.link_child = link_child
item.link_child = MediaChild(item, load = True)
elif item.selftext:
expand = getattr(item, 'expand_children', False)
item.link_child = SelfTextChild(item, expand = expand,