Use urljoin to create proper feed media URLs

This commit is contained in:
ayleph 2015-11-03 22:56:33 -05:00 committed by Christopher Allan Webber
parent ba6d2d7e78
commit fb071a38fe

View File

@ -45,6 +45,7 @@ from mediagoblin.tools.common import import_component
from mediagoblin.tools.routing import extract_url_arguments from mediagoblin.tools.routing import extract_url_arguments
import six import six
from six.moves.urllib.parse import urljoin
from pytz import UTC from pytz import UTC
_log = logging.getLogger(__name__) _log = logging.getLogger(__name__)
@ -742,10 +743,10 @@ class MediaEntry(Base, MediaEntryMixin, CommentingMixin):
"objectType": self.object_type, "objectType": self.object_type,
"url": self.url_for_self(request.urlgen, qualified=True), "url": self.url_for_self(request.urlgen, qualified=True),
"image": { "image": {
"url": request.host_url + self.thumb_url[1:], "url": urljoin(request.host_url, self.thumb_url),
}, },
"fullImage":{ "fullImage":{
"url": request.host_url + self.original_url[1:], "url": urljoin(request.host_url, self.original_url),
}, },
"published": published.isoformat(), "published": published.isoformat(),
"updated": updated.isoformat(), "updated": updated.isoformat(),