From 23740eaa3da94fbe2e25180376961979fc4e8cd3 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 23 Jan 2024 11:26:48 +0000 Subject: Correctly mention previous copyright (#16820) During the migration the automated script to update the copyright headers accidentally got rid of some of the existing copyright lines. Reinstate them. --- synapse/media/_base.py | 2 ++ synapse/media/filepath.py | 2 ++ synapse/media/media_repository.py | 2 ++ synapse/media/media_storage.py | 1 + synapse/media/oembed.py | 1 + synapse/media/preview_html.py | 1 + synapse/media/storage_provider.py | 1 + synapse/media/thumbnailer.py | 2 ++ synapse/media/url_previewer.py | 2 ++ 9 files changed, 14 insertions(+) (limited to 'synapse/media') diff --git a/synapse/media/_base.py b/synapse/media/_base.py index acd0a5a2e8..3fbed6062f 100644 --- a/synapse/media/_base.py +++ b/synapse/media/_base.py @@ -1,6 +1,8 @@ # # This file is licensed under the Affero General Public License (AGPL) version 3. # +# Copyright 2019-2021 The Matrix.org Foundation C.I.C. +# Copyright 2014-2016 OpenMarket Ltd # Copyright (C) 2023 New Vector, Ltd # # This program is free software: you can redistribute it and/or modify diff --git a/synapse/media/filepath.py b/synapse/media/filepath.py index 86ab77ce80..3d7863e2fb 100644 --- a/synapse/media/filepath.py +++ b/synapse/media/filepath.py @@ -1,6 +1,8 @@ # # This file is licensed under the Affero General Public License (AGPL) version 3. # +# Copyright 2020-2021 The Matrix.org Foundation C.I.C. +# Copyright 2014-2016 OpenMarket Ltd # Copyright (C) 2023 New Vector, Ltd # # This program is free software: you can redistribute it and/or modify diff --git a/synapse/media/media_repository.py b/synapse/media/media_repository.py index 4cb975d377..52859ed490 100644 --- a/synapse/media/media_repository.py +++ b/synapse/media/media_repository.py @@ -1,6 +1,8 @@ # # This file is licensed under the Affero General Public License (AGPL) version 3. # +# Copyright 2018-2021 The Matrix.org Foundation C.I.C. +# Copyright 2014-2016 OpenMarket Ltd # Copyright (C) 2023 New Vector, Ltd # # This program is free software: you can redistribute it and/or modify diff --git a/synapse/media/media_storage.py b/synapse/media/media_storage.py index 0cf8a9be7e..b45b319f5c 100644 --- a/synapse/media/media_storage.py +++ b/synapse/media/media_storage.py @@ -1,6 +1,7 @@ # # This file is licensed under the Affero General Public License (AGPL) version 3. # +# Copyright 2018-2021 The Matrix.org Foundation C.I.C. # Copyright (C) 2023 New Vector, Ltd # # This program is free software: you can redistribute it and/or modify diff --git a/synapse/media/oembed.py b/synapse/media/oembed.py index 0bcfc4aab6..94ece30459 100644 --- a/synapse/media/oembed.py +++ b/synapse/media/oembed.py @@ -1,6 +1,7 @@ # # This file is licensed under the Affero General Public License (AGPL) version 3. # +# Copyright 2021 The Matrix.org Foundation C.I.C. # Copyright (C) 2023 New Vector, Ltd # # This program is free software: you can redistribute it and/or modify diff --git a/synapse/media/preview_html.py b/synapse/media/preview_html.py index ee77c7da56..8a2c098d53 100644 --- a/synapse/media/preview_html.py +++ b/synapse/media/preview_html.py @@ -1,6 +1,7 @@ # # This file is licensed under the Affero General Public License (AGPL) version 3. # +# Copyright 2021 The Matrix.org Foundation C.I.C. # Copyright (C) 2023 New Vector, Ltd # # This program is free software: you can redistribute it and/or modify diff --git a/synapse/media/storage_provider.py b/synapse/media/storage_provider.py index f91772a9f2..06e5d27a53 100644 --- a/synapse/media/storage_provider.py +++ b/synapse/media/storage_provider.py @@ -1,6 +1,7 @@ # # This file is licensed under the Affero General Public License (AGPL) version 3. # +# Copyright 2018-2021 The Matrix.org Foundation C.I.C. # Copyright (C) 2023 New Vector, Ltd # # This program is free software: you can redistribute it and/or modify diff --git a/synapse/media/thumbnailer.py b/synapse/media/thumbnailer.py index 810d5012ca..5538020bec 100644 --- a/synapse/media/thumbnailer.py +++ b/synapse/media/thumbnailer.py @@ -1,6 +1,8 @@ # # This file is licensed under the Affero General Public License (AGPL) version 3. # +# Copyright 2020-2021 The Matrix.org Foundation C.I.C. +# Copyright 2014-2016 OpenMarket Ltd # Copyright (C) 2023 New Vector, Ltd # # This program is free software: you can redistribute it and/or modify diff --git a/synapse/media/url_previewer.py b/synapse/media/url_previewer.py index ef62575057..3897823b35 100644 --- a/synapse/media/url_previewer.py +++ b/synapse/media/url_previewer.py @@ -1,6 +1,8 @@ # # This file is licensed under the Affero General Public License (AGPL) version 3. # +# Copyright 2020-2023 The Matrix.org Foundation C.I.C. +# Copyright 2016 OpenMarket Ltd # Copyright (C) 2023 New Vector, Ltd # # This program is free software: you can redistribute it and/or modify -- cgit 1.5.1