aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db/models.py
diff options
context:
space:
mode:
authorayleph <ayleph@thisshitistemp.com>2015-11-03 22:56:33 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2015-11-19 16:16:40 -0600
commitfb071a38fed27e3bf2406bba77ef8a2679a82963 (patch)
tree1f3b800661a46ce7e69a0510baf5e3328671c6c4 /mediagoblin/db/models.py
parentba6d2d7e7842b42e5dee7cc48c8729aa020f6c94 (diff)
downloadmediagoblin-fb071a38fed27e3bf2406bba77ef8a2679a82963.tar.lz
mediagoblin-fb071a38fed27e3bf2406bba77ef8a2679a82963.tar.xz
mediagoblin-fb071a38fed27e3bf2406bba77ef8a2679a82963.zip
Use urljoin to create proper feed media URLs
Diffstat (limited to 'mediagoblin/db/models.py')
-rw-r--r--mediagoblin/db/models.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 67659552..430d081d 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -45,6 +45,7 @@ from mediagoblin.tools.common import import_component
from mediagoblin.tools.routing import extract_url_arguments
import six
+from six.moves.urllib.parse import urljoin
from pytz import UTC
_log = logging.getLogger(__name__)
@@ -742,10 +743,10 @@ class MediaEntry(Base, MediaEntryMixin, CommentingMixin):
"objectType": self.object_type,
"url": self.url_for_self(request.urlgen, qualified=True),
"image": {
- "url": request.host_url + self.thumb_url[1:],
+ "url": urljoin(request.host_url, self.thumb_url),
},
"fullImage":{
- "url": request.host_url + self.original_url[1:],
+ "url": urljoin(request.host_url, self.original_url),
},
"published": published.isoformat(),
"updated": updated.isoformat(),