|
40 | 40 | from synapse.http.site import SynapseRequest |
41 | 41 | from synapse.logging.context import defer_to_thread |
42 | 42 | from synapse.metrics.background_process_metrics import run_as_background_process |
43 | | -from synapse.rest.media.v1.create_resource import CreateResource |
44 | 43 | from synapse.types import UserID |
45 | 44 | from synapse.util.async_helpers import Linearizer |
46 | 45 | from synapse.util.retryutils import NotRetryingDestination |
|
55 | 54 | respond_with_responder, |
56 | 55 | ) |
57 | 56 | from .config_resource import MediaConfigResource |
| 57 | +from .create_resource import CreateResource |
58 | 58 | from .download_resource import DownloadResource |
59 | 59 | from .filepath import MediaFilePaths |
60 | 60 | from .media_storage import MediaStorage |
@@ -362,11 +362,12 @@ async def get_local_media( |
362 | 362 | Returns: |
363 | 363 | Resolves once a response has successfully been written to request |
364 | 364 | """ |
365 | | - self.mark_recently_accessed(None, media_id) |
366 | 365 | media_info = await self.get_local_media_info(request, media_id, max_stall_ms) |
367 | 366 | if not media_info: |
368 | 367 | return |
369 | 368 |
|
| 369 | + self.mark_recently_accessed(None, media_id) |
| 370 | + |
370 | 371 | media_type = media_info["media_type"] |
371 | 372 | if not media_type: |
372 | 373 | media_type = "application/octet-stream" |
@@ -1211,8 +1212,7 @@ def __init__(self, hs: "HomeServer", version: MediaVersion): |
1211 | 1212 | self.putChild(b"upload", UploadResource(hs, media_repo, False)) |
1212 | 1213 | self.putChild(b"download", DownloadResource(hs, media_repo)) |
1213 | 1214 | self.putChild( |
1214 | | - b"thumbnail", |
1215 | | - ThumbnailResource(hs, media_repo, media_repo.media_storage), |
| 1215 | + b"thumbnail", ThumbnailResource(hs, media_repo, media_repo.media_storage) |
1216 | 1216 | ) |
1217 | 1217 | if hs.config.media.url_preview_enabled: |
1218 | 1218 | self.putChild( |
|
0 commit comments