summary refs log tree commit diff
path: root/synapse/rest/media/v1
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-13 11:41:06 +0100
committerErik Johnston <erik@matrix.org>2017-10-13 11:41:06 +0100
commita675bd08bd1a016a16bd0e10547e8c26be391ee0 (patch)
tree8f0f9c7dbd82829d10e6a05f175ce6c4c6603a34 /synapse/rest/media/v1
parentRemove unnecessary diff (diff)
downloadsynapse-a675bd08bd1a016a16bd0e10547e8c26be391ee0.tar.xz
Add paths back in...
Diffstat (limited to 'synapse/rest/media/v1')
-rw-r--r--synapse/rest/media/v1/filepath.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/rest/media/v1/filepath.py b/synapse/rest/media/v1/filepath.py
index a3a15ac302..fec0bbf572 100644
--- a/synapse/rest/media/v1/filepath.py
+++ b/synapse/rest/media/v1/filepath.py
@@ -100,7 +100,7 @@ class MediaFilePaths(object):
 
     def remote_media_thumbnail_dir(self, server_name, file_id):
         return os.path.join(
-            "remote_thumbnail", server_name,
+            self.primary_base_path, "remote_thumbnail", server_name,
             file_id[0:2], file_id[2:4], file_id[4:],
         )
 
@@ -125,18 +125,18 @@ class MediaFilePaths(object):
         if NEW_FORMAT_ID_RE.match(media_id):
             return [
                 os.path.join(
-                    "url_cache",
+                    self.primary_base_path, "url_cache",
                     media_id[:10],
                 ),
             ]
         else:
             return [
                 os.path.join(
-                    "url_cache",
+                    self.primary_base_path, "url_cache",
                     media_id[0:2], media_id[2:4],
                 ),
                 os.path.join(
-                    "url_cache",
+                    self.primary_base_path, "url_cache",
                     media_id[0:2],
                 ),
             ]