diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 4a8f3589e..d08c7338d 100644 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -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""" diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py index b7c2e4c70..12c290134 100644 --- a/r2/r2/models/link.py +++ b/r2/r2/models/link.py @@ -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,