diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2023-02-27 08:26:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-27 08:26:05 -0500 |
| commit | 4fc8875876374ec8f97a3b3cc344a4e3abcf769f (patch) | |
| tree | 41b920427c0f62cd1463324c89fe7f5ce3d15164 /synapse/config/repository.py | |
| parent | Small fixes to `MatrixFederationHttpClient` docstrings (#15148) (diff) | |
| download | synapse-4fc8875876374ec8f97a3b3cc344a4e3abcf769f.tar.xz | |
Refactor media modules. (#15146)
* Removes the `v1` directory from `test.rest.media.v1`. * Moves the non-REST code from `synapse.rest.media.v1` to `synapse.media`. * Flatten the `v1` directory from `synapse.rest.media`, but leave compatiblity with 3rd party media repositories and spam checkers.
Diffstat (limited to 'synapse/config/repository.py')
| -rw-r--r-- | synapse/config/repository.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 2da40c09f0..ecb3edbe3a 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -178,11 +178,13 @@ class ContentRepositoryConfig(Config): for i, provider_config in enumerate(storage_providers): # We special case the module "file_system" so as not to need to # expose FileStorageProviderBackend - if provider_config["module"] == "file_system": - provider_config["module"] = ( - "synapse.rest.media.v1.storage_provider" - ".FileStorageProviderBackend" - ) + if ( + provider_config["module"] == "file_system" + or provider_config["module"] == "synapse.rest.media.v1.storage_provider" + ): + provider_config[ + "module" + ] = "synapse.media.storage_provider.FileStorageProviderBackend" provider_class, parsed_config = load_module( provider_config, ("media_storage_providers", "<item %i>" % i) |