From bcb83939133c3e062fbc570abc1295b1592ea872 Mon Sep 17 00:00:00 2001 From: Nick Sergeant Date: Thu, 3 Nov 2016 13:47:41 -0400 Subject: [PATCH] Fix various URLs. --- snipts/models.py | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/snipts/models.py b/snipts/models.py index 1d1b560..15c63dc 100644 --- a/snipts/models.py +++ b/snipts/models.py @@ -236,18 +236,12 @@ class Snipt(models.Model): return u'https://{}.snipt.net/{}/'.format( self.user.username, self.slug) - if settings.DEBUG: - root = 'http://local.snipt.net' - else: - root = 'https://snipt.net' - if self.public: - return u'{}/{}/{}/'.format(root, self.user.username, self.slug) + return u'/{}/{}/'.format(self.user.username, self.slug) else: - return u'{}/{}/{}/?key={}'.format(root, - self.user.username, - self.slug, - self.key) + return u'/{}/{}/?key={}'.format(self.user.username, + self.slug, + self.key) def get_download_url(self): @@ -264,12 +258,7 @@ class Snipt(models.Model): else: filename = u'{}.txt'.format(self.slug) - if settings.DEBUG: - root = 'http://local.snipt.net' - else: - root = 'https://snipt.net' - - return u'{}/download/{}/{}'.format(root, self.key, filename) + return u'/download/{}/{}'.format(self.key, filename) def get_embed_url(self): @@ -281,13 +270,7 @@ class Snipt(models.Model): return '{}/embed/{}/'.format(root, self.key) def get_raw_url(self): - - if settings.DEBUG: - root = 'http://local.snipt.net' - else: - root = 'https://snipt.net' - - return '{}/raw/{}/'.format(root, self.key) + return '/raw/{}/'.format(self.key) @property def sorted_tags(self):