From b8e4f8427e8696fdb80f07938a3437ed2e2e1aa7 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 7 Oct 2024 11:37:42 +0100 Subject: [PATCH 1/6] Add missing license header --- .../schema/main/delta/88/01_add_delayed_events.sql | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/synapse/storage/schema/main/delta/88/01_add_delayed_events.sql b/synapse/storage/schema/main/delta/88/01_add_delayed_events.sql index 55bfbc8ae7c..78ba5129af5 100644 --- a/synapse/storage/schema/main/delta/88/01_add_delayed_events.sql +++ b/synapse/storage/schema/main/delta/88/01_add_delayed_events.sql @@ -1,3 +1,16 @@ +-- +-- This file is licensed under the Affero General Public License (AGPL) version 3. +-- +-- Copyright (C) 2024 New Vector, Ltd +-- +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU Affero General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- See the GNU Affero General Public License for more details: +-- . + CREATE TABLE delayed_events ( delay_id TEXT NOT NULL, user_localpart TEXT NOT NULL, From 40ec6110b028979d3156b537005d7879c119ceea Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 7 Oct 2024 11:39:01 +0100 Subject: [PATCH 2/6] Newsfile --- changelog.d/17793.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/17793.misc diff --git a/changelog.d/17793.misc b/changelog.d/17793.misc new file mode 100644 index 00000000000..ea9a99583c6 --- /dev/null +++ b/changelog.d/17793.misc @@ -0,0 +1 @@ +Add missing license header. From d434397bcdc67773c149ec6ae94e61e681345f38 Mon Sep 17 00:00:00 2001 From: Andrew Ferrazzutti Date: Mon, 7 Oct 2024 09:11:38 -0400 Subject: [PATCH 3/6] Add missing license headers on source files --- synapse/handlers/delayed_events.py | 14 ++++++++++++++ synapse/replication/http/delayed_events.py | 14 ++++++++++++++ synapse/rest/client/delayed_events.py | 14 ++++++++++++++ synapse/storage/databases/main/delayed_events.py | 14 ++++++++++++++ tests/rest/client/test_delayed_events.py | 14 ++++++++++++++ 5 files changed, 70 insertions(+) diff --git a/synapse/handlers/delayed_events.py b/synapse/handlers/delayed_events.py index 9d59a099486..3c88a96fd3f 100644 --- a/synapse/handlers/delayed_events.py +++ b/synapse/handlers/delayed_events.py @@ -1,3 +1,17 @@ +# +# This file is licensed under the Affero General Public License (AGPL) version 3. +# +# Copyright (C) 2024 New Vector, Ltd +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# See the GNU Affero General Public License for more details: +# . +# + import logging from typing import TYPE_CHECKING, List, Optional, Set, Tuple diff --git a/synapse/replication/http/delayed_events.py b/synapse/replication/http/delayed_events.py index 77dabb08e63..229022070c8 100644 --- a/synapse/replication/http/delayed_events.py +++ b/synapse/replication/http/delayed_events.py @@ -1,3 +1,17 @@ +# +# This file is licensed under the Affero General Public License (AGPL) version 3. +# +# Copyright (C) 2024 New Vector, Ltd +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# See the GNU Affero General Public License for more details: +# . +# + import logging from typing import TYPE_CHECKING, Dict, Optional, Tuple diff --git a/synapse/rest/client/delayed_events.py b/synapse/rest/client/delayed_events.py index eae5c9d2269..2dd5a60b2b1 100644 --- a/synapse/rest/client/delayed_events.py +++ b/synapse/rest/client/delayed_events.py @@ -1,3 +1,17 @@ +# +# This file is licensed under the Affero General Public License (AGPL) version 3. +# +# Copyright (C) 2024 New Vector, Ltd +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# See the GNU Affero General Public License for more details: +# . +# + # This module contains REST servlets to do with delayed events: /delayed_events/ import logging diff --git a/synapse/storage/databases/main/delayed_events.py b/synapse/storage/databases/main/delayed_events.py index 1a7781713f4..1616e30e221 100644 --- a/synapse/storage/databases/main/delayed_events.py +++ b/synapse/storage/databases/main/delayed_events.py @@ -1,3 +1,17 @@ +# +# This file is licensed under the Affero General Public License (AGPL) version 3. +# +# Copyright (C) 2024 New Vector, Ltd +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# See the GNU Affero General Public License for more details: +# . +# + import logging from typing import List, NewType, Optional, Tuple diff --git a/tests/rest/client/test_delayed_events.py b/tests/rest/client/test_delayed_events.py index cb77c73da24..1793b38c4a8 100644 --- a/tests/rest/client/test_delayed_events.py +++ b/tests/rest/client/test_delayed_events.py @@ -1,3 +1,17 @@ +# +# This file is licensed under the Affero General Public License (AGPL) version 3. +# +# Copyright (C) 2024 New Vector, Ltd +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# See the GNU Affero General Public License for more details: +# . +# + """Tests REST events for /delayed_events paths.""" from http import HTTPStatus From 2ae9806a0433d14f87712de547e62ff2bc055b99 Mon Sep 17 00:00:00 2001 From: Andrew Ferrazzutti Date: Mon, 7 Oct 2024 09:12:08 -0400 Subject: [PATCH 4/6] Update copyright years on edited source files --- synapse/app/generic_worker.py | 2 +- synapse/replication/http/__init__.py | 2 +- tests/rest/client/test_rooms.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py index 6a944998f17..a528c3890d7 100644 --- a/synapse/app/generic_worker.py +++ b/synapse/app/generic_worker.py @@ -3,7 +3,7 @@ # # Copyright 2020 The Matrix.org Foundation C.I.C. # Copyright 2016 OpenMarket Ltd -# Copyright (C) 2023 New Vector, Ltd +# Copyright (C) 2023-2024 New Vector, Ltd # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/synapse/replication/http/__init__.py b/synapse/replication/http/__init__.py index 1673bd057e6..d5000517143 100644 --- a/synapse/replication/http/__init__.py +++ b/synapse/replication/http/__init__.py @@ -1,7 +1,7 @@ # # This file is licensed under the Affero General Public License (AGPL) version 3. # -# Copyright (C) 2023 New Vector, Ltd +# Copyright (C) 2023-2024 New Vector, Ltd # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/tests/rest/client/test_rooms.py b/tests/rest/client/test_rooms.py index 00be0051c61..2ecd37ca1a0 100644 --- a/tests/rest/client/test_rooms.py +++ b/tests/rest/client/test_rooms.py @@ -4,7 +4,7 @@ # Copyright 2019 The Matrix.org Foundation C.I.C. # Copyright 2017 Vector Creations Ltd # Copyright 2014-2016 OpenMarket Ltd -# Copyright (C) 2023 New Vector, Ltd +# Copyright (C) 2023-2024 New Vector, Ltd # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as From 6db43590d9a93396237dd181327e61c6d842a527 Mon Sep 17 00:00:00 2001 From: Andrew Ferrazzutti Date: Mon, 7 Oct 2024 09:12:35 -0400 Subject: [PATCH 5/6] Update newsfile --- changelog.d/17793.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/17793.misc b/changelog.d/17793.misc index ea9a99583c6..99022f4f534 100644 --- a/changelog.d/17793.misc +++ b/changelog.d/17793.misc @@ -1 +1 @@ -Add missing license header. +Add missing license headers on new source files. From 17a4fa494af3616dd4f0dc42359be81b396d2a90 Mon Sep 17 00:00:00 2001 From: Andrew Ferrazzutti Date: Mon, 7 Oct 2024 09:17:24 -0400 Subject: [PATCH 6/6] Rename changelog file --- changelog.d/{17793.misc => 17799.misc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog.d/{17793.misc => 17799.misc} (100%) diff --git a/changelog.d/17793.misc b/changelog.d/17799.misc similarity index 100% rename from changelog.d/17793.misc rename to changelog.d/17799.misc