From 6bfe946bd2d82db12c1e49918612cc3d7139b8ce Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Thu, 17 Oct 2024 17:16:37 +0200 Subject: [PATCH 01/13] Update the copyright headers in all files --- appservice/api/query.go | 15 +++------------ appservice/appservice.go | 14 +++----------- appservice/consumers/roomserver.go | 14 +++----------- appservice/query/query.go | 15 +++------------ build/dendritejs-pinecone/jsServer.go | 14 +++----------- build/dendritejs-pinecone/main.go | 14 +++----------- build/dendritejs-pinecone/main_noop.go | 14 +++----------- build/dendritejs-pinecone/main_test.go | 14 +++----------- build/gobind-pinecone/monolith.go | 14 +++----------- build/gobind-pinecone/monolith_test.go | 14 +++----------- build/gobind-pinecone/platform_ios.go | 14 +++----------- build/gobind-pinecone/platform_other.go | 14 +++----------- clientapi/api/api.go | 14 +++----------- clientapi/auth/auth.go | 14 +++----------- clientapi/auth/authtypes/flow.go | 5 ++++- clientapi/auth/authtypes/membership.go | 14 +++----------- clientapi/auth/authtypes/profile.go | 14 +++----------- clientapi/auth/authtypes/threepid.go | 14 +++----------- clientapi/auth/login.go | 14 +++----------- clientapi/auth/login_application_service.go | 14 +++----------- clientapi/auth/login_test.go | 14 +++----------- clientapi/auth/login_token.go | 14 +++----------- clientapi/auth/password.go | 14 +++----------- clientapi/auth/user_interactive.go | 14 +++----------- clientapi/clientapi.go | 14 +++----------- clientapi/httputil/httputil.go | 14 +++----------- clientapi/httputil/parse.go | 5 ++++- clientapi/producers/syncapi.go | 14 +++----------- clientapi/routing/account_data.go | 14 +++----------- clientapi/routing/admin_whois.go | 14 +++----------- clientapi/routing/aliases.go | 14 +++----------- clientapi/routing/auth_fallback.go | 14 +++----------- clientapi/routing/capabilities.go | 14 +++----------- clientapi/routing/createroom.go | 14 +++----------- clientapi/routing/device.go | 14 +++----------- clientapi/routing/directory.go | 14 +++----------- clientapi/routing/directory_public.go | 14 +++----------- clientapi/routing/joined_rooms.go | 14 +++----------- clientapi/routing/joinroom.go | 14 +++----------- clientapi/routing/key_backup.go | 14 +++----------- clientapi/routing/key_crosssigning.go | 14 +++----------- clientapi/routing/keys.go | 14 +++----------- clientapi/routing/leaveroom.go | 14 +++----------- clientapi/routing/login.go | 14 +++----------- clientapi/routing/logout.go | 14 +++----------- clientapi/routing/membership.go | 14 +++----------- clientapi/routing/memberships.go | 14 +++----------- clientapi/routing/notification.go | 14 +++----------- clientapi/routing/openid.go | 14 +++----------- clientapi/routing/peekroom.go | 15 +++------------ clientapi/routing/presence.go | 14 +++----------- clientapi/routing/profile.go | 14 +++----------- clientapi/routing/pusher.go | 14 +++----------- clientapi/routing/receipt.go | 14 +++----------- clientapi/routing/redaction.go | 14 +++----------- clientapi/routing/register.go | 14 +++----------- clientapi/routing/register_test.go | 14 +++----------- clientapi/routing/report_event.go | 14 +++----------- clientapi/routing/room_hierarchy.go | 14 +++----------- clientapi/routing/room_tagging.go | 14 +++----------- clientapi/routing/routing.go | 14 +++----------- clientapi/routing/sendevent.go | 14 +++----------- clientapi/routing/sendtodevice.go | 5 ++++- clientapi/routing/sendtyping.go | 5 ++++- clientapi/routing/server_notices.go | 14 +++----------- clientapi/routing/state.go | 14 +++----------- clientapi/routing/thirdparty.go | 14 +++----------- clientapi/routing/threepid.go | 14 +++----------- clientapi/routing/upgrade_room.go | 14 +++----------- clientapi/routing/userdirectory.go | 14 +++----------- clientapi/routing/voip.go | 14 +++----------- clientapi/routing/whoami.go | 5 ++++- clientapi/threepid/invites.go | 14 +++----------- clientapi/threepid/threepid.go | 14 +++----------- clientapi/userutil/userutil.go | 5 ++++- clientapi/userutil/userutil_test.go | 5 ++++- cmd/create-account/main.go | 14 +++----------- cmd/dendrite-demo-pinecone/conduit/conduit.go | 14 +++----------- .../conduit/conduit_test.go | 14 +++----------- cmd/dendrite-demo-pinecone/conn/client.go | 14 +++----------- cmd/dendrite-demo-pinecone/conn/ws.go | 14 +++----------- .../defaults/defaults.go | 14 +++----------- .../embed/embed_elementweb.go | 14 +++----------- .../embed/embed_other.go | 14 +++----------- cmd/dendrite-demo-pinecone/main.go | 14 +++----------- cmd/dendrite-demo-pinecone/monolith/keys.go | 14 +++----------- .../monolith/monolith.go | 14 +++----------- cmd/dendrite-demo-pinecone/relay/retriever.go | 14 +++----------- .../relay/retriever_test.go | 14 +++----------- cmd/dendrite-demo-pinecone/rooms/rooms.go | 14 +++----------- cmd/dendrite-demo-pinecone/users/users.go | 14 +++----------- cmd/dendrite-demo-yggdrasil/main.go | 14 +++----------- cmd/dendrite-demo-yggdrasil/signing/fetcher.go | 14 +++----------- cmd/dendrite-demo-yggdrasil/yggconn/node.go | 14 +++----------- .../yggrooms/yggrooms.go | 14 +++----------- cmd/dendrite/main.go | 14 +++----------- cmd/generate-keys/main.go | 14 +++----------- contrib/dendrite-demo-i2p/main.go | 14 +++----------- contrib/dendrite-demo-i2p/main_i2p.go | 14 +++----------- contrib/dendrite-demo-tor/main.go | 14 +++----------- contrib/dendrite-demo-tor/main_tor.go | 14 +++----------- federationapi/consumers/keychange.go | 14 +++----------- federationapi/consumers/presence.go | 14 +++----------- federationapi/consumers/receipts.go | 14 +++----------- federationapi/consumers/roomserver.go | 14 +++----------- federationapi/consumers/roomserver_test.go | 14 +++----------- federationapi/consumers/sendtodevice.go | 14 +++----------- federationapi/consumers/typing.go | 14 +++----------- federationapi/federationapi.go | 14 +++----------- .../internal/federationclient_test.go | 14 +++----------- federationapi/internal/perform_test.go | 14 +++----------- federationapi/producers/syncapi.go | 14 +++----------- federationapi/queue/destinationqueue.go | 14 +++----------- federationapi/queue/queue.go | 14 +++----------- federationapi/queue/queue_test.go | 14 +++----------- federationapi/routing/backfill.go | 15 +++------------ federationapi/routing/devices.go | 5 ++++- federationapi/routing/eventauth.go | 5 ++++- federationapi/routing/events.go | 15 +++------------ federationapi/routing/invite.go | 14 +++----------- federationapi/routing/join.go | 15 +++------------ federationapi/routing/keys.go | 14 +++----------- federationapi/routing/leave.go | 5 ++++- federationapi/routing/missingevents.go | 5 ++++- federationapi/routing/openid.go | 14 +++----------- federationapi/routing/peek.go | 15 +++------------ federationapi/routing/profile.go | 15 +++------------ federationapi/routing/profile_test.go | 14 +++----------- federationapi/routing/query.go | 15 +++------------ federationapi/routing/query_test.go | 14 +++----------- federationapi/routing/routing.go | 14 +++----------- federationapi/routing/send.go | 14 +++----------- federationapi/routing/send_test.go | 14 +++----------- federationapi/routing/state.go | 5 ++++- federationapi/routing/threepid.go | 14 +++----------- federationapi/routing/version.go | 15 +++------------ federationapi/storage/interface.go | 14 +++----------- .../storage/postgres/assumed_offline_table.go | 14 +++----------- .../storage/postgres/blacklist_table.go | 14 +++----------- .../postgres/deltas/2021020411080000_rooms.go | 14 +++----------- .../deltas/2022042812473400_addexpiresat.go | 14 +++----------- .../storage/postgres/inbound_peeks_table.go | 14 +++----------- .../storage/postgres/joined_hosts_table.go | 18 +++++------------- .../postgres/notary_server_keys_json_table.go | 14 +++----------- .../notary_server_keys_metadata_table.go | 14 +++----------- .../storage/postgres/outbound_peeks_table.go | 14 +++----------- .../storage/postgres/queue_edus_table.go | 14 +++----------- .../storage/postgres/queue_json_table.go | 14 +++----------- .../storage/postgres/queue_pdus_table.go | 14 +++----------- .../storage/postgres/relay_servers_table.go | 14 +++----------- .../storage/postgres/server_key_table.go | 18 +++++------------- federationapi/storage/postgres/storage.go | 18 +++++------------- .../storage/shared/receipt/receipt.go | 14 +++----------- federationapi/storage/shared/storage.go | 14 +++----------- federationapi/storage/shared/storage_edus.go | 14 +++----------- federationapi/storage/shared/storage_keys.go | 18 +++++------------- federationapi/storage/shared/storage_pdus.go | 14 +++----------- .../storage/sqlite3/assumed_offline_table.go | 14 +++----------- .../storage/sqlite3/blacklist_table.go | 14 +++----------- .../sqlite3/deltas/2021020411080000_rooms.go | 14 +++----------- .../deltas/2022042812473400_addexpiresat.go | 14 +++----------- .../storage/sqlite3/inbound_peeks_table.go | 14 +++----------- .../storage/sqlite3/joined_hosts_table.go | 18 +++++------------- .../sqlite3/notary_server_keys_json_table.go | 14 +++----------- .../notary_server_keys_metadata_table.go | 14 +++----------- .../storage/sqlite3/outbound_peeks_table.go | 14 +++----------- .../storage/sqlite3/queue_edus_table.go | 14 +++----------- .../storage/sqlite3/queue_json_table.go | 18 +++++------------- .../storage/sqlite3/queue_pdus_table.go | 18 +++++------------- .../storage/sqlite3/relay_servers_table.go | 14 +++----------- .../storage/sqlite3/server_key_table.go | 18 +++++------------- federationapi/storage/sqlite3/storage.go | 14 +++----------- federationapi/storage/storage.go | 14 +++----------- federationapi/storage/storage_wasm.go | 14 +++----------- federationapi/storage/tables/interface.go | 14 +++----------- federationapi/types/types.go | 14 +++----------- internal/caching/cache_typing.go | 18 +++++------------- internal/caching/cache_typing_test.go | 18 +++++------------- internal/caching/caches.go | 14 +++----------- internal/caching/impl_ristretto.go | 14 +++----------- internal/eventutil/eventcontent.go | 14 +++----------- internal/eventutil/events.go | 14 +++----------- internal/eventutil/types.go | 14 +++----------- internal/fulltext/bleve.go | 14 +++----------- internal/fulltext/bleve_test.go | 14 +++----------- internal/fulltext/bleve_wasm.go | 14 +++----------- internal/hooks/hooks.go | 14 +++----------- internal/httputil/httpapi.go | 14 +++----------- internal/httputil/httpapi_test.go | 14 +++----------- internal/httputil/paths.go | 14 +++----------- internal/httputil/routing.go | 14 +++----------- internal/log.go | 14 +++----------- internal/log_unix.go | 14 +++----------- internal/log_windows.go | 14 +++----------- internal/sqlutil/connection_manager.go | 14 +++----------- internal/sqlutil/migrate.go | 14 +++----------- internal/sqlutil/sql.go | 14 +++----------- internal/sqlutil/unique_constraint.go | 14 +++----------- internal/sqlutil/unique_constraint_cgo.go | 14 +++----------- internal/sqlutil/unique_constraint_wasm.go | 14 +++----------- internal/sqlutil/uri.go | 14 +++----------- internal/tracing.go | 14 +++----------- internal/transactionrequest.go | 14 +++----------- internal/transactionrequest_test.go | 14 +++----------- internal/transactions/transactions.go | 5 ++++- internal/transactions/transactions_test.go | 5 ++++- internal/validate.go | 14 +++----------- mediaapi/fileutils/fileutils.go | 14 +++----------- mediaapi/mediaapi.go | 14 +++----------- mediaapi/routing/download.go | 14 +++----------- mediaapi/routing/routing.go | 14 +++----------- mediaapi/routing/upload.go | 14 +++----------- mediaapi/storage/interface.go | 14 +++----------- .../storage/postgres/media_repository_table.go | 18 +++++------------- mediaapi/storage/postgres/mediaapi.go | 18 +++++------------- mediaapi/storage/postgres/thumbnail_table.go | 18 +++++------------- mediaapi/storage/shared/mediaapi.go | 14 +++----------- .../storage/sqlite3/media_repository_table.go | 18 +++++------------- mediaapi/storage/sqlite3/mediaapi.go | 18 +++++------------- mediaapi/storage/sqlite3/thumbnail_table.go | 18 +++++------------- mediaapi/storage/storage.go | 14 +++----------- mediaapi/storage/storage_wasm.go | 14 +++----------- mediaapi/storage/tables/interface.go | 14 +++----------- mediaapi/thumbnailer/thumbnailer.go | 14 +++----------- mediaapi/thumbnailer/thumbnailer_bimg.go | 14 +++----------- mediaapi/thumbnailer/thumbnailer_nfnt.go | 14 +++----------- mediaapi/types/types.go | 14 +++----------- relayapi/api/api.go | 14 +++----------- relayapi/internal/api.go | 14 +++----------- relayapi/internal/perform.go | 14 +++----------- relayapi/internal/perform_test.go | 14 +++----------- relayapi/relayapi.go | 14 +++----------- relayapi/relayapi_test.go | 14 +++----------- relayapi/routing/relaytxn.go | 14 +++----------- relayapi/routing/relaytxn_test.go | 14 +++----------- relayapi/routing/routing.go | 14 +++----------- relayapi/routing/sendrelay.go | 14 +++----------- relayapi/routing/sendrelay_test.go | 14 +++----------- relayapi/storage/interface.go | 14 +++----------- .../storage/postgres/relay_queue_json_table.go | 14 +++----------- relayapi/storage/postgres/relay_queue_table.go | 14 +++----------- relayapi/storage/postgres/storage.go | 14 +++----------- relayapi/storage/shared/storage.go | 14 +++----------- .../storage/sqlite3/relay_queue_json_table.go | 14 +++----------- relayapi/storage/sqlite3/relay_queue_table.go | 14 +++----------- relayapi/storage/sqlite3/storage.go | 14 +++----------- relayapi/storage/storage.go | 14 +++----------- relayapi/storage/storage_wasm.go | 14 +++----------- relayapi/storage/tables/interface.go | 14 +++----------- .../tables/relay_queue_json_table_test.go | 14 +++----------- .../storage/tables/relay_queue_table_test.go | 14 +++----------- roomserver/acls/acls.go | 14 +++----------- roomserver/acls/acls_test.go | 14 +++----------- roomserver/api/alias.go | 14 +++----------- roomserver/api/input.go | 14 +++----------- roomserver/api/output.go | 14 +++----------- roomserver/api/query.go | 18 +++++------------- roomserver/api/wrapper.go | 14 +++----------- roomserver/auth/auth.go | 5 ++++- roomserver/internal/alias.go | 14 +++----------- roomserver/internal/helpers/auth.go | 14 +++----------- roomserver/internal/helpers/auth_test.go | 14 +++----------- roomserver/internal/input/input.go | 14 +++----------- roomserver/internal/input/input_events.go | 18 +++++------------- .../internal/input/input_latest_events.go | 18 +++++------------- roomserver/internal/input/input_membership.go | 14 +++----------- roomserver/internal/perform/perform_admin.go | 14 +++----------- .../internal/perform/perform_backfill.go | 14 +++----------- .../internal/perform/perform_create_room.go | 14 +++----------- roomserver/internal/perform/perform_forget.go | 14 +++----------- .../internal/perform/perform_inbound_peek.go | 15 +++------------ roomserver/internal/perform/perform_invite.go | 14 +++----------- roomserver/internal/perform/perform_join.go | 14 +++----------- roomserver/internal/perform/perform_leave.go | 14 +++----------- roomserver/internal/perform/perform_peek.go | 15 +++------------ roomserver/internal/perform/perform_publish.go | 14 +++----------- roomserver/internal/perform/perform_unpeek.go | 15 +++------------ roomserver/internal/perform/perform_upgrade.go | 14 +++----------- roomserver/internal/query/query.go | 14 +++----------- .../internal/query/query_room_hierarchy.go | 14 +++----------- roomserver/internal/query/query_test.go | 14 +++----------- roomserver/producers/roomevent.go | 14 +++----------- roomserver/roomserver.go | 14 +++----------- roomserver/state/state.go | 18 +++++------------- roomserver/state/state_test.go | 18 +++++------------- roomserver/storage/interface.go | 14 +++----------- .../20201028212440_add_forgotten_column.go | 14 +++----------- .../2021041615092700_state_blocks_refactor.go | 14 +++----------- .../20221027084407_published_appservice.go | 14 +++----------- ...20230131091021_published_appservice_pkey.go | 14 +++----------- .../20230516154000_drop_reference_sha.go | 14 +++----------- .../storage/postgres/event_json_table.go | 18 +++++------------- .../storage/postgres/event_state_keys_table.go | 18 +++++------------- .../storage/postgres/event_types_table.go | 18 +++++------------- roomserver/storage/postgres/events_table.go | 18 +++++------------- roomserver/storage/postgres/invite_table.go | 18 +++++------------- .../storage/postgres/membership_table.go | 18 +++++------------- .../storage/postgres/previous_events_table.go | 18 +++++------------- roomserver/storage/postgres/published_table.go | 14 +++----------- .../storage/postgres/purge_statements.go | 14 +++----------- .../storage/postgres/redactions_table.go | 14 +++----------- .../storage/postgres/reported_events_table.go | 14 +++----------- .../storage/postgres/room_aliases_table.go | 18 +++++------------- roomserver/storage/postgres/rooms_table.go | 18 +++++------------- .../storage/postgres/state_block_table.go | 18 +++++------------- .../storage/postgres/state_snapshot_table.go | 18 +++++------------- roomserver/storage/postgres/storage.go | 18 +++++------------- .../storage/postgres/user_room_keys_table.go | 14 +++----------- roomserver/storage/shared/prepare.go | 18 +++++------------- .../20201028212440_add_forgotten_column.go | 14 +++----------- .../2021041615092700_state_blocks_refactor.go | 14 +++----------- .../20221027084407_published_appservice.go | 14 +++----------- .../20230516154000_drop_reference_sha.go | 14 +++----------- roomserver/storage/sqlite3/event_json_table.go | 18 +++++------------- .../storage/sqlite3/event_state_keys_table.go | 18 +++++------------- .../storage/sqlite3/event_types_table.go | 18 +++++------------- roomserver/storage/sqlite3/events_table.go | 18 +++++------------- roomserver/storage/sqlite3/invite_table.go | 18 +++++------------- roomserver/storage/sqlite3/membership_table.go | 18 +++++------------- .../storage/sqlite3/previous_events_table.go | 18 +++++------------- roomserver/storage/sqlite3/published_table.go | 14 +++----------- roomserver/storage/sqlite3/purge_statements.go | 14 +++----------- roomserver/storage/sqlite3/redactions_table.go | 14 +++----------- .../storage/sqlite3/reported_events_table.go | 14 +++----------- .../storage/sqlite3/room_aliases_table.go | 18 +++++------------- roomserver/storage/sqlite3/rooms_table.go | 18 +++++------------- .../storage/sqlite3/state_block_table.go | 18 +++++------------- .../storage/sqlite3/state_snapshot_table.go | 18 +++++------------- roomserver/storage/sqlite3/storage.go | 18 +++++------------- .../storage/sqlite3/user_room_keys_table.go | 14 +++----------- roomserver/storage/storage.go | 14 +++----------- roomserver/storage/storage_wasm.go | 14 +++----------- roomserver/types/headered_event.go | 14 +++----------- roomserver/types/types.go | 14 +++----------- roomserver/version/version.go | 14 +++----------- setup/base/base.go | 14 +++----------- setup/config/config.go | 14 +++----------- setup/config/config_appservice.go | 14 +++----------- setup/config/config_relayapi.go | 14 +++----------- setup/config/config_test.go | 14 +++----------- setup/flags.go | 14 +++----------- setup/monolith.go | 14 +++----------- setup/mscs/msc2836/msc2836.go | 14 +++----------- setup/mscs/mscs.go | 14 +++----------- syncapi/consumers/clientapi.go | 14 +++----------- syncapi/consumers/keychange.go | 14 +++----------- syncapi/consumers/presence.go | 14 +++----------- syncapi/consumers/receipts.go | 14 +++----------- syncapi/consumers/roomserver.go | 14 +++----------- syncapi/consumers/sendtodevice.go | 14 +++----------- syncapi/consumers/typing.go | 14 +++----------- syncapi/consumers/userapi.go | 14 +++----------- syncapi/internal/history_visibility.go | 14 +++----------- syncapi/internal/keychange.go | 14 +++----------- syncapi/notifier/notifier.go | 14 +++----------- syncapi/notifier/notifier_test.go | 14 +++----------- syncapi/notifier/userstream.go | 14 +++----------- syncapi/producers/appservices.go | 14 +++----------- syncapi/producers/federationapi_presence.go | 14 +++----------- syncapi/routing/context.go | 14 +++----------- syncapi/routing/filter.go | 14 +++----------- syncapi/routing/getevent.go | 14 +++----------- syncapi/routing/memberships.go | 14 +++----------- syncapi/routing/messages.go | 15 +++------------ syncapi/routing/relations.go | 14 +++----------- syncapi/routing/routing.go | 14 +++----------- syncapi/routing/search.go | 14 +++----------- syncapi/storage/interface.go | 14 +++----------- syncapi/storage/postgres/account_data_table.go | 18 +++++------------- .../postgres/backwards_extremities_table.go | 15 +++------------ .../postgres/current_room_state_table.go | 18 +++++------------- .../deltas/20201211125500_sequences.go | 14 +++----------- .../20210112130000_sendtodevice_sentcolumn.go | 14 +++----------- ...22061412000000_history_visibility_column.go | 14 +++----------- .../deltas/20230201152200_rename_index.go | 14 +++----------- syncapi/storage/postgres/filter_table.go | 14 +++----------- syncapi/storage/postgres/filtering.go | 14 +++----------- syncapi/storage/postgres/ignores_table.go | 14 +++----------- syncapi/storage/postgres/invites_table.go | 18 +++++------------- syncapi/storage/postgres/memberships_table.go | 14 +++----------- .../postgres/notification_data_table.go | 14 +++----------- .../postgres/output_room_events_table.go | 18 +++++------------- .../output_room_events_topology_table.go | 15 +++------------ syncapi/storage/postgres/peeks_table.go | 14 +++----------- syncapi/storage/postgres/presence_table.go | 14 +++----------- syncapi/storage/postgres/receipt_table.go | 14 +++----------- syncapi/storage/postgres/relations_table.go | 14 +++----------- .../storage/postgres/send_to_device_table.go | 16 ++++------------ syncapi/storage/postgres/syncserver.go | 18 +++++------------- syncapi/storage/shared/storage_consumer.go | 14 +++----------- syncapi/storage/sqlite3/account_data_table.go | 18 +++++------------- .../sqlite3/backwards_extremities_table.go | 15 +++------------ .../sqlite3/current_room_state_table.go | 18 +++++------------- .../sqlite3/deltas/20201211125500_sequences.go | 14 +++----------- .../20210112130000_sendtodevice_sentcolumn.go | 14 +++----------- ...22061412000000_history_visibility_column.go | 14 +++----------- syncapi/storage/sqlite3/filter_table.go | 14 +++----------- syncapi/storage/sqlite3/ignores_table.go | 14 +++----------- syncapi/storage/sqlite3/invites_table.go | 18 +++++------------- syncapi/storage/sqlite3/memberships_table.go | 14 +++----------- .../storage/sqlite3/notification_data_table.go | 14 +++----------- .../sqlite3/output_room_events_table.go | 18 +++++------------- .../output_room_events_topology_table.go | 15 +++------------ syncapi/storage/sqlite3/peeks_table.go | 14 +++----------- syncapi/storage/sqlite3/presence_table.go | 14 +++----------- syncapi/storage/sqlite3/receipt_table.go | 14 +++----------- syncapi/storage/sqlite3/relations_table.go | 14 +++----------- .../storage/sqlite3/send_to_device_table.go | 16 ++++------------ syncapi/storage/sqlite3/syncserver.go | 18 +++++------------- syncapi/storage/storage.go | 14 +++----------- syncapi/storage/storage_wasm.go | 14 +++----------- syncapi/storage/tables/interface.go | 14 +++----------- syncapi/streams/stream_presence.go | 14 +++----------- syncapi/sync/request.go | 14 +++----------- syncapi/sync/requestpool.go | 18 +++++------------- syncapi/syncapi.go | 14 +++----------- syncapi/synctypes/clientevent.go | 16 ++++------------ syncapi/synctypes/clientevent_test.go | 16 ++++------------ syncapi/synctypes/filter.go | 14 +++----------- syncapi/types/presence.go | 14 +++----------- syncapi/types/types.go | 14 +++----------- test/db.go | 14 +++----------- test/event.go | 14 +++----------- test/keyring.go | 14 +++----------- test/keys.go | 14 +++----------- test/memory_federation_db.go | 14 +++----------- test/memory_relay_db.go | 14 +++----------- test/room.go | 14 +++----------- test/slice.go | 5 ++++- test/testrig/base.go | 14 +++----------- test/user.go | 14 +++----------- userapi/api/api.go | 14 +++----------- userapi/api/api_logintoken.go | 14 +++----------- userapi/consumers/clientapi.go | 14 +++----------- userapi/consumers/devicelistupdate.go | 14 +++----------- userapi/consumers/signingkeyupdate.go | 14 +++----------- userapi/internal/api_logintoken.go | 14 +++----------- userapi/internal/cross_signing.go | 14 +++----------- userapi/internal/device_list_update.go | 14 +++----------- userapi/internal/device_list_update_default.go | 14 +++----------- userapi/internal/device_list_update_sytest.go | 14 +++----------- userapi/internal/device_list_update_test.go | 14 +++----------- userapi/internal/key_api.go | 14 +++----------- userapi/internal/user_api.go | 14 +++----------- userapi/producers/keychange.go | 14 +++----------- userapi/storage/interface.go | 14 +++----------- userapi/storage/postgres/account_data_table.go | 14 +++----------- userapi/storage/postgres/accounts_table.go | 14 +++----------- .../postgres/cross_signing_keys_table.go | 14 +++----------- .../postgres/cross_signing_sigs_table.go | 14 +++----------- .../deltas/2022012016470000_key_changes.go | 14 +++----------- .../deltas/2022042612000000_xsigning_idx.go | 14 +++----------- userapi/storage/postgres/device_keys_table.go | 14 +++----------- userapi/storage/postgres/devices_table.go | 14 +++----------- userapi/storage/postgres/key_backup_table.go | 14 +++----------- .../postgres/key_backup_version_table.go | 14 +++----------- userapi/storage/postgres/key_changes_table.go | 14 +++----------- userapi/storage/postgres/logintoken_table.go | 14 +++----------- .../storage/postgres/notifications_table.go | 14 +++----------- .../storage/postgres/one_time_keys_table.go | 14 +++----------- userapi/storage/postgres/profile_table.go | 14 +++----------- userapi/storage/postgres/pusher_table.go | 14 +++----------- userapi/storage/postgres/stale_device_lists.go | 14 +++----------- userapi/storage/postgres/stats_table.go | 14 +++----------- userapi/storage/postgres/storage.go | 14 +++----------- userapi/storage/postgres/threepid_table.go | 14 +++----------- userapi/storage/shared/storage.go | 14 +++----------- userapi/storage/sqlite3/account_data_table.go | 14 +++----------- userapi/storage/sqlite3/accounts_table.go | 14 +++----------- userapi/storage/sqlite3/constraint_wasm.go | 14 +++----------- .../sqlite3/cross_signing_keys_table.go | 14 +++----------- .../sqlite3/cross_signing_sigs_table.go | 14 +++----------- .../deltas/2022012016470000_key_changes.go | 14 +++----------- .../deltas/2022042612000000_xsigning_idx.go | 14 +++----------- userapi/storage/sqlite3/device_keys_table.go | 14 +++----------- userapi/storage/sqlite3/devices_table.go | 14 +++----------- userapi/storage/sqlite3/key_backup_table.go | 14 +++----------- .../sqlite3/key_backup_version_table.go | 14 +++----------- userapi/storage/sqlite3/key_changes_table.go | 14 +++----------- userapi/storage/sqlite3/logintoken_table.go | 14 +++----------- userapi/storage/sqlite3/notifications_table.go | 14 +++----------- userapi/storage/sqlite3/one_time_keys_table.go | 14 +++----------- userapi/storage/sqlite3/profile_table.go | 14 +++----------- userapi/storage/sqlite3/pusher_table.go | 14 +++----------- userapi/storage/sqlite3/stale_device_lists.go | 14 +++----------- userapi/storage/sqlite3/stats_table.go | 14 +++----------- userapi/storage/sqlite3/storage.go | 14 +++----------- userapi/storage/sqlite3/threepid_table.go | 14 +++----------- userapi/storage/storage.go | 14 +++----------- userapi/storage/storage_wasm.go | 14 +++----------- userapi/storage/tables/interface.go | 14 +++----------- userapi/types/statistics.go | 14 +++----------- userapi/types/storage.go | 14 +++----------- userapi/userapi.go | 14 +++----------- userapi/userapi_test.go | 14 +++----------- userapi/util/phonehomestats.go | 14 +++----------- userapi/util/stats.go | 14 +++----------- userapi/util/stats_wasm.go | 14 +++----------- userapi/util/stats_windows.go | 14 +++----------- 499 files changed, 1631 insertions(+), 5465 deletions(-) diff --git a/appservice/api/query.go b/appservice/api/query.go index 8e159152e..38b0ab27f 100644 --- a/appservice/api/query.go +++ b/appservice/api/query.go @@ -1,16 +1,7 @@ -// Copyright 2018 New Vector Ltd +// Copyright 2018-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // Package api contains methods used by dendrite components in multi-process // mode to send requests to the appservice component, typically in order to ask diff --git a/appservice/appservice.go b/appservice/appservice.go index d94a483e0..99e76ba8a 100644 --- a/appservice/appservice.go +++ b/appservice/appservice.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2018 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package appservice diff --git a/appservice/consumers/roomserver.go b/appservice/consumers/roomserver.go index b07b24fcc..08aef5153 100644 --- a/appservice/consumers/roomserver.go +++ b/appservice/consumers/roomserver.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2018 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/appservice/query/query.go b/appservice/query/query.go index 7f33e17f8..1783db9fd 100644 --- a/appservice/query/query.go +++ b/appservice/query/query.go @@ -1,16 +1,7 @@ -// Copyright 2018 New Vector Ltd +// Copyright 2018-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // Package query handles requests from other internal dendrite components when // they interact with the AppServiceQueryAPI. diff --git a/build/dendritejs-pinecone/jsServer.go b/build/dendritejs-pinecone/jsServer.go index 4298c2ae9..589f84a31 100644 --- a/build/dendritejs-pinecone/jsServer.go +++ b/build/dendritejs-pinecone/jsServer.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build wasm // +build wasm diff --git a/build/dendritejs-pinecone/main.go b/build/dendritejs-pinecone/main.go index 6acc93c7b..250595520 100644 --- a/build/dendritejs-pinecone/main.go +++ b/build/dendritejs-pinecone/main.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build wasm // +build wasm diff --git a/build/dendritejs-pinecone/main_noop.go b/build/dendritejs-pinecone/main_noop.go index 0cc7e47e5..3b70bbbce 100644 --- a/build/dendritejs-pinecone/main_noop.go +++ b/build/dendritejs-pinecone/main_noop.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !wasm // +build !wasm diff --git a/build/dendritejs-pinecone/main_test.go b/build/dendritejs-pinecone/main_test.go index 17fea6cce..a0270c37c 100644 --- a/build/dendritejs-pinecone/main_test.go +++ b/build/dendritejs-pinecone/main_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build wasm // +build wasm diff --git a/build/gobind-pinecone/monolith.go b/build/gobind-pinecone/monolith.go index 8718c71fd..1f53fba89 100644 --- a/build/gobind-pinecone/monolith.go +++ b/build/gobind-pinecone/monolith.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package gobind diff --git a/build/gobind-pinecone/monolith_test.go b/build/gobind-pinecone/monolith_test.go index f16d1d764..4bfeb7ac6 100644 --- a/build/gobind-pinecone/monolith_test.go +++ b/build/gobind-pinecone/monolith_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package gobind diff --git a/build/gobind-pinecone/platform_ios.go b/build/gobind-pinecone/platform_ios.go index a89ebfcd0..c54a872e5 100644 --- a/build/gobind-pinecone/platform_ios.go +++ b/build/gobind-pinecone/platform_ios.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build ios // +build ios diff --git a/build/gobind-pinecone/platform_other.go b/build/gobind-pinecone/platform_other.go index 2793026b8..1cfd0d894 100644 --- a/build/gobind-pinecone/platform_other.go +++ b/build/gobind-pinecone/platform_other.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !ios // +build !ios diff --git a/clientapi/api/api.go b/clientapi/api/api.go index 28ff593fc..ccda80e95 100644 --- a/clientapi/api/api.go +++ b/clientapi/api/api.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package api diff --git a/clientapi/auth/auth.go b/clientapi/auth/auth.go index 8fae45b8d..6740cbbb3 100644 --- a/clientapi/auth/auth.go +++ b/clientapi/auth/auth.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // Package auth implements authentication checks and storage. package auth diff --git a/clientapi/auth/authtypes/flow.go b/clientapi/auth/authtypes/flow.go index d5766fcc2..7388a5ebb 100644 --- a/clientapi/auth/authtypes/flow.go +++ b/clientapi/auth/authtypes/flow.go @@ -10,7 +10,10 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2024 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package authtypes diff --git a/clientapi/auth/authtypes/membership.go b/clientapi/auth/authtypes/membership.go index ad5312db6..7ce12250c 100644 --- a/clientapi/auth/authtypes/membership.go +++ b/clientapi/auth/authtypes/membership.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package authtypes diff --git a/clientapi/auth/authtypes/profile.go b/clientapi/auth/authtypes/profile.go index 29468c168..007097197 100644 --- a/clientapi/auth/authtypes/profile.go +++ b/clientapi/auth/authtypes/profile.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package authtypes diff --git a/clientapi/auth/authtypes/threepid.go b/clientapi/auth/authtypes/threepid.go index ebafbe6aa..ff41c0258 100644 --- a/clientapi/auth/authtypes/threepid.go +++ b/clientapi/auth/authtypes/threepid.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package authtypes diff --git a/clientapi/auth/login.go b/clientapi/auth/login.go index 58a27e593..fe7aecbcc 100644 --- a/clientapi/auth/login.go +++ b/clientapi/auth/login.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package auth diff --git a/clientapi/auth/login_application_service.go b/clientapi/auth/login_application_service.go index dd4a9cbb4..44d61bd92 100644 --- a/clientapi/auth/login_application_service.go +++ b/clientapi/auth/login_application_service.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package auth diff --git a/clientapi/auth/login_test.go b/clientapi/auth/login_test.go index a2c2a719c..41cb500e2 100644 --- a/clientapi/auth/login_test.go +++ b/clientapi/auth/login_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package auth diff --git a/clientapi/auth/login_token.go b/clientapi/auth/login_token.go index eb631481a..7e18662ac 100644 --- a/clientapi/auth/login_token.go +++ b/clientapi/auth/login_token.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package auth diff --git a/clientapi/auth/password.go b/clientapi/auth/password.go index fb7def024..7d94244ee 100644 --- a/clientapi/auth/password.go +++ b/clientapi/auth/password.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package auth diff --git a/clientapi/auth/user_interactive.go b/clientapi/auth/user_interactive.go index 9831450cc..e80c32bfe 100644 --- a/clientapi/auth/user_interactive.go +++ b/clientapi/auth/user_interactive.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package auth diff --git a/clientapi/clientapi.go b/clientapi/clientapi.go index aee16eb00..cbbe7c1b3 100644 --- a/clientapi/clientapi.go +++ b/clientapi/clientapi.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package clientapi diff --git a/clientapi/httputil/httputil.go b/clientapi/httputil/httputil.go index d9f442323..7ec931e8d 100644 --- a/clientapi/httputil/httputil.go +++ b/clientapi/httputil/httputil.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package httputil diff --git a/clientapi/httputil/parse.go b/clientapi/httputil/parse.go index a952d1778..f6ac7caaa 100644 --- a/clientapi/httputil/parse.go +++ b/clientapi/httputil/parse.go @@ -8,7 +8,10 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2024 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package httputil diff --git a/clientapi/producers/syncapi.go b/clientapi/producers/syncapi.go index 905ecce4d..82b6b6bee 100644 --- a/clientapi/producers/syncapi.go +++ b/clientapi/producers/syncapi.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package producers diff --git a/clientapi/routing/account_data.go b/clientapi/routing/account_data.go index 81afc3b13..9cdb8c184 100644 --- a/clientapi/routing/account_data.go +++ b/clientapi/routing/account_data.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/admin_whois.go b/clientapi/routing/admin_whois.go index 7d7536564..2ca26fb90 100644 --- a/clientapi/routing/admin_whois.go +++ b/clientapi/routing/admin_whois.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 David Spenler // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/aliases.go b/clientapi/routing/aliases.go index 2d6b72d3e..be9284fe0 100644 --- a/clientapi/routing/aliases.go +++ b/clientapi/routing/aliases.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/auth_fallback.go b/clientapi/routing/auth_fallback.go index f8d3684fe..37e431057 100644 --- a/clientapi/routing/auth_fallback.go +++ b/clientapi/routing/auth_fallback.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2019 Parminder Singh // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/capabilities.go b/clientapi/routing/capabilities.go index 38e5bd467..d037fd006 100644 --- a/clientapi/routing/capabilities.go +++ b/clientapi/routing/capabilities.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/createroom.go b/clientapi/routing/createroom.go index 47e3ba1c3..d41f44114 100644 --- a/clientapi/routing/createroom.go +++ b/clientapi/routing/createroom.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/device.go b/clientapi/routing/device.go index 6f2de3539..4322305cd 100644 --- a/clientapi/routing/device.go +++ b/clientapi/routing/device.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Paul Tötterman // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/directory.go b/clientapi/routing/directory.go index 9466f583f..97ce95b1c 100644 --- a/clientapi/routing/directory.go +++ b/clientapi/routing/directory.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/directory_public.go b/clientapi/routing/directory_public.go index 67146630c..faf1feff4 100644 --- a/clientapi/routing/directory_public.go +++ b/clientapi/routing/directory_public.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/joined_rooms.go b/clientapi/routing/joined_rooms.go index 3fe0d8b4d..531c1b7af 100644 --- a/clientapi/routing/joined_rooms.go +++ b/clientapi/routing/joined_rooms.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/joinroom.go b/clientapi/routing/joinroom.go index 43331b42a..a4714825b 100644 --- a/clientapi/routing/joinroom.go +++ b/clientapi/routing/joinroom.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/key_backup.go b/clientapi/routing/key_backup.go index 7f8bd9f40..b7602eac3 100644 --- a/clientapi/routing/key_backup.go +++ b/clientapi/routing/key_backup.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/key_crosssigning.go b/clientapi/routing/key_crosssigning.go index 6bf7c58e3..982e199e5 100644 --- a/clientapi/routing/key_crosssigning.go +++ b/clientapi/routing/key_crosssigning.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/keys.go b/clientapi/routing/keys.go index 871b8b08e..a6d0b639b 100644 --- a/clientapi/routing/keys.go +++ b/clientapi/routing/keys.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/leaveroom.go b/clientapi/routing/leaveroom.go index 7e8c066eb..674944c9f 100644 --- a/clientapi/routing/leaveroom.go +++ b/clientapi/routing/leaveroom.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/login.go b/clientapi/routing/login.go index 0f55c8816..ca8ace55c 100644 --- a/clientapi/routing/login.go +++ b/clientapi/routing/login.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/logout.go b/clientapi/routing/logout.go index d06bac784..997660963 100644 --- a/clientapi/routing/logout.go +++ b/clientapi/routing/logout.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/membership.go b/clientapi/routing/membership.go index 9e41a3794..d37bb1ad1 100644 --- a/clientapi/routing/membership.go +++ b/clientapi/routing/membership.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/memberships.go b/clientapi/routing/memberships.go index 84be498d6..fca712c8b 100644 --- a/clientapi/routing/memberships.go +++ b/clientapi/routing/memberships.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2024 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/notification.go b/clientapi/routing/notification.go index 4b9043faa..aa86f19c1 100644 --- a/clientapi/routing/notification.go +++ b/clientapi/routing/notification.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 Dan Peleg // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/openid.go b/clientapi/routing/openid.go index 8dfba8af9..45022b678 100644 --- a/clientapi/routing/openid.go +++ b/clientapi/routing/openid.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/peekroom.go b/clientapi/routing/peekroom.go index 772dc8477..5bdc9eba6 100644 --- a/clientapi/routing/peekroom.go +++ b/clientapi/routing/peekroom.go @@ -1,16 +1,7 @@ -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/presence.go b/clientapi/routing/presence.go index 5aa6d8dd2..93c829363 100644 --- a/clientapi/routing/presence.go +++ b/clientapi/routing/presence.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/profile.go b/clientapi/routing/profile.go index 9959144c8..3d95884e2 100644 --- a/clientapi/routing/profile.go +++ b/clientapi/routing/profile.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/pusher.go b/clientapi/routing/pusher.go index ed59129cc..6cb89e3e9 100644 --- a/clientapi/routing/pusher.go +++ b/clientapi/routing/pusher.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 Dan Peleg // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/receipt.go b/clientapi/routing/receipt.go index 1d7e35562..df333b2ed 100644 --- a/clientapi/routing/receipt.go +++ b/clientapi/routing/receipt.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/redaction.go b/clientapi/routing/redaction.go index f331a73c7..e41ac86c9 100644 --- a/clientapi/routing/redaction.go +++ b/clientapi/routing/redaction.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/register.go b/clientapi/routing/register.go index 5235e9092..4ea3b4eba 100644 --- a/clientapi/routing/register.go +++ b/clientapi/routing/register.go @@ -1,17 +1,9 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // Copyright 2017 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/register_test.go b/clientapi/routing/register_test.go index 7fa740e7f..7b6474b77 100644 --- a/clientapi/routing/register_test.go +++ b/clientapi/routing/register_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Andrew Morgan // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/report_event.go b/clientapi/routing/report_event.go index 4dc6498d8..c088859dd 100644 --- a/clientapi/routing/report_event.go +++ b/clientapi/routing/report_event.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/room_hierarchy.go b/clientapi/routing/room_hierarchy.go index cf9d43dd1..ae7ca3286 100644 --- a/clientapi/routing/room_hierarchy.go +++ b/clientapi/routing/room_hierarchy.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/room_tagging.go b/clientapi/routing/room_tagging.go index 5a5296bf4..f30bc3ba0 100644 --- a/clientapi/routing/room_tagging.go +++ b/clientapi/routing/room_tagging.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2019 Sumukha PK // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/routing.go b/clientapi/routing/routing.go index e82c8861c..600fb2792 100644 --- a/clientapi/routing/routing.go +++ b/clientapi/routing/routing.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/sendevent.go b/clientapi/routing/sendevent.go index 44e82aed0..c71a3f4cf 100644 --- a/clientapi/routing/sendevent.go +++ b/clientapi/routing/sendevent.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/sendtodevice.go b/clientapi/routing/sendtodevice.go index 58d3053e2..11f36cd4f 100644 --- a/clientapi/routing/sendtodevice.go +++ b/clientapi/routing/sendtodevice.go @@ -8,7 +8,10 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2024 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/sendtyping.go b/clientapi/routing/sendtyping.go index 979bced3b..1d2a53f4a 100644 --- a/clientapi/routing/sendtyping.go +++ b/clientapi/routing/sendtyping.go @@ -8,7 +8,10 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2024 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/server_notices.go b/clientapi/routing/server_notices.go index d4644b3e5..a8209a458 100644 --- a/clientapi/routing/server_notices.go +++ b/clientapi/routing/server_notices.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/state.go b/clientapi/routing/state.go index 18f9a0e9c..6727972f1 100644 --- a/clientapi/routing/state.go +++ b/clientapi/routing/state.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/thirdparty.go b/clientapi/routing/thirdparty.go index b805d4b51..a9406b851 100644 --- a/clientapi/routing/thirdparty.go +++ b/clientapi/routing/thirdparty.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/threepid.go b/clientapi/routing/threepid.go index 5261a1407..bd8667b50 100644 --- a/clientapi/routing/threepid.go +++ b/clientapi/routing/threepid.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/upgrade_room.go b/clientapi/routing/upgrade_room.go index 03c0230e6..49e4d06fe 100644 --- a/clientapi/routing/upgrade_room.go +++ b/clientapi/routing/upgrade_room.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/userdirectory.go b/clientapi/routing/userdirectory.go index 32cefde63..171b887ff 100644 --- a/clientapi/routing/userdirectory.go +++ b/clientapi/routing/userdirectory.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/voip.go b/clientapi/routing/voip.go index 14a08b79c..641a4e20d 100644 --- a/clientapi/routing/voip.go +++ b/clientapi/routing/voip.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Michael Telatysnki <7t3chguy@gmail.com> // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/routing/whoami.go b/clientapi/routing/whoami.go index a1d9d6675..041f47493 100644 --- a/clientapi/routing/whoami.go +++ b/clientapi/routing/whoami.go @@ -8,7 +8,10 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2024 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/clientapi/threepid/invites.go b/clientapi/threepid/invites.go index 365e9f869..15edbbedf 100644 --- a/clientapi/threepid/invites.go +++ b/clientapi/threepid/invites.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package threepid diff --git a/clientapi/threepid/threepid.go b/clientapi/threepid/threepid.go index ad94a49c6..28a43e2e1 100644 --- a/clientapi/threepid/threepid.go +++ b/clientapi/threepid/threepid.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package threepid diff --git a/clientapi/userutil/userutil.go b/clientapi/userutil/userutil.go index 26237142b..aa8623b36 100644 --- a/clientapi/userutil/userutil.go +++ b/clientapi/userutil/userutil.go @@ -8,7 +8,10 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2024 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package userutil diff --git a/clientapi/userutil/userutil_test.go b/clientapi/userutil/userutil_test.go index cdda0a88a..b68d574a1 100644 --- a/clientapi/userutil/userutil_test.go +++ b/clientapi/userutil/userutil_test.go @@ -8,7 +8,10 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2024 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package userutil diff --git a/cmd/create-account/main.go b/cmd/create-account/main.go index 772778680..72b4b3f6d 100644 --- a/cmd/create-account/main.go +++ b/cmd/create-account/main.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package main diff --git a/cmd/dendrite-demo-pinecone/conduit/conduit.go b/cmd/dendrite-demo-pinecone/conduit/conduit.go index be139c19c..2d291e240 100644 --- a/cmd/dendrite-demo-pinecone/conduit/conduit.go +++ b/cmd/dendrite-demo-pinecone/conduit/conduit.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package conduit diff --git a/cmd/dendrite-demo-pinecone/conduit/conduit_test.go b/cmd/dendrite-demo-pinecone/conduit/conduit_test.go index d8cd3133f..4322eb3d1 100644 --- a/cmd/dendrite-demo-pinecone/conduit/conduit_test.go +++ b/cmd/dendrite-demo-pinecone/conduit/conduit_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package conduit diff --git a/cmd/dendrite-demo-pinecone/conn/client.go b/cmd/dendrite-demo-pinecone/conn/client.go index 5d1417dd5..f68868ce5 100644 --- a/cmd/dendrite-demo-pinecone/conn/client.go +++ b/cmd/dendrite-demo-pinecone/conn/client.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package conn diff --git a/cmd/dendrite-demo-pinecone/conn/ws.go b/cmd/dendrite-demo-pinecone/conn/ws.go index ed85abd51..d7ecd0d1b 100644 --- a/cmd/dendrite-demo-pinecone/conn/ws.go +++ b/cmd/dendrite-demo-pinecone/conn/ws.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package conn diff --git a/cmd/dendrite-demo-pinecone/defaults/defaults.go b/cmd/dendrite-demo-pinecone/defaults/defaults.go index 9da54d5f5..d6341446f 100644 --- a/cmd/dendrite-demo-pinecone/defaults/defaults.go +++ b/cmd/dendrite-demo-pinecone/defaults/defaults.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package defaults diff --git a/cmd/dendrite-demo-pinecone/embed/embed_elementweb.go b/cmd/dendrite-demo-pinecone/embed/embed_elementweb.go index d37362e21..7ebfb6f88 100644 --- a/cmd/dendrite-demo-pinecone/embed/embed_elementweb.go +++ b/cmd/dendrite-demo-pinecone/embed/embed_elementweb.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build elementweb // +build elementweb diff --git a/cmd/dendrite-demo-pinecone/embed/embed_other.go b/cmd/dendrite-demo-pinecone/embed/embed_other.go index 94360fce6..87851c8d4 100644 --- a/cmd/dendrite-demo-pinecone/embed/embed_other.go +++ b/cmd/dendrite-demo-pinecone/embed/embed_other.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !elementweb // +build !elementweb diff --git a/cmd/dendrite-demo-pinecone/main.go b/cmd/dendrite-demo-pinecone/main.go index 18d1dd31f..fdeaec813 100644 --- a/cmd/dendrite-demo-pinecone/main.go +++ b/cmd/dendrite-demo-pinecone/main.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package main diff --git a/cmd/dendrite-demo-pinecone/monolith/keys.go b/cmd/dendrite-demo-pinecone/monolith/keys.go index 637f24a43..82c6dea30 100644 --- a/cmd/dendrite-demo-pinecone/monolith/keys.go +++ b/cmd/dendrite-demo-pinecone/monolith/keys.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package monolith diff --git a/cmd/dendrite-demo-pinecone/monolith/monolith.go b/cmd/dendrite-demo-pinecone/monolith/monolith.go index d9f44b5cc..06303f0fd 100644 --- a/cmd/dendrite-demo-pinecone/monolith/monolith.go +++ b/cmd/dendrite-demo-pinecone/monolith/monolith.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package monolith diff --git a/cmd/dendrite-demo-pinecone/relay/retriever.go b/cmd/dendrite-demo-pinecone/relay/retriever.go index 9c918fb67..98fcf45df 100644 --- a/cmd/dendrite-demo-pinecone/relay/retriever.go +++ b/cmd/dendrite-demo-pinecone/relay/retriever.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package relay diff --git a/cmd/dendrite-demo-pinecone/relay/retriever_test.go b/cmd/dendrite-demo-pinecone/relay/retriever_test.go index 6ec9aaf5d..2a784792f 100644 --- a/cmd/dendrite-demo-pinecone/relay/retriever_test.go +++ b/cmd/dendrite-demo-pinecone/relay/retriever_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package relay diff --git a/cmd/dendrite-demo-pinecone/rooms/rooms.go b/cmd/dendrite-demo-pinecone/rooms/rooms.go index 57282a003..60cc3c7fe 100644 --- a/cmd/dendrite-demo-pinecone/rooms/rooms.go +++ b/cmd/dendrite-demo-pinecone/rooms/rooms.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package rooms diff --git a/cmd/dendrite-demo-pinecone/users/users.go b/cmd/dendrite-demo-pinecone/users/users.go index 079df328d..261c08215 100644 --- a/cmd/dendrite-demo-pinecone/users/users.go +++ b/cmd/dendrite-demo-pinecone/users/users.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package users diff --git a/cmd/dendrite-demo-yggdrasil/main.go b/cmd/dendrite-demo-yggdrasil/main.go index b02f131ae..55d3e68d7 100644 --- a/cmd/dendrite-demo-yggdrasil/main.go +++ b/cmd/dendrite-demo-yggdrasil/main.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package main diff --git a/cmd/dendrite-demo-yggdrasil/signing/fetcher.go b/cmd/dendrite-demo-yggdrasil/signing/fetcher.go index aeaa2022e..bf911c6da 100644 --- a/cmd/dendrite-demo-yggdrasil/signing/fetcher.go +++ b/cmd/dendrite-demo-yggdrasil/signing/fetcher.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package signing diff --git a/cmd/dendrite-demo-yggdrasil/yggconn/node.go b/cmd/dendrite-demo-yggdrasil/yggconn/node.go index 3c230f623..cee02e1b7 100644 --- a/cmd/dendrite-demo-yggdrasil/yggconn/node.go +++ b/cmd/dendrite-demo-yggdrasil/yggconn/node.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package yggconn diff --git a/cmd/dendrite-demo-yggdrasil/yggrooms/yggrooms.go b/cmd/dendrite-demo-yggdrasil/yggrooms/yggrooms.go index 7ebecb651..386d60a2e 100644 --- a/cmd/dendrite-demo-yggdrasil/yggrooms/yggrooms.go +++ b/cmd/dendrite-demo-yggdrasil/yggrooms/yggrooms.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package yggrooms diff --git a/cmd/dendrite/main.go b/cmd/dendrite/main.go index 5234b7504..f8b3dc530 100644 --- a/cmd/dendrite/main.go +++ b/cmd/dendrite/main.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package main diff --git a/cmd/generate-keys/main.go b/cmd/generate-keys/main.go index d4c8cf78a..973550f64 100644 --- a/cmd/generate-keys/main.go +++ b/cmd/generate-keys/main.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package main diff --git a/contrib/dendrite-demo-i2p/main.go b/contrib/dendrite-demo-i2p/main.go index 92cfab49a..3f2bc8534 100644 --- a/contrib/dendrite-demo-i2p/main.go +++ b/contrib/dendrite-demo-i2p/main.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package main diff --git a/contrib/dendrite-demo-i2p/main_i2p.go b/contrib/dendrite-demo-i2p/main_i2p.go index 72fed656e..47d70f008 100644 --- a/contrib/dendrite-demo-i2p/main_i2p.go +++ b/contrib/dendrite-demo-i2p/main_i2p.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package main diff --git a/contrib/dendrite-demo-tor/main.go b/contrib/dendrite-demo-tor/main.go index f82d6d538..0b20ad04a 100644 --- a/contrib/dendrite-demo-tor/main.go +++ b/contrib/dendrite-demo-tor/main.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package main diff --git a/contrib/dendrite-demo-tor/main_tor.go b/contrib/dendrite-demo-tor/main_tor.go index 8f889c41a..411868452 100644 --- a/contrib/dendrite-demo-tor/main_tor.go +++ b/contrib/dendrite-demo-tor/main_tor.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package main diff --git a/federationapi/consumers/keychange.go b/federationapi/consumers/keychange.go index 6210bddb6..03c4eee36 100644 --- a/federationapi/consumers/keychange.go +++ b/federationapi/consumers/keychange.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/federationapi/consumers/presence.go b/federationapi/consumers/presence.go index dd100bc08..06077d31e 100644 --- a/federationapi/consumers/presence.go +++ b/federationapi/consumers/presence.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/federationapi/consumers/receipts.go b/federationapi/consumers/receipts.go index 1407a88b7..99f463717 100644 --- a/federationapi/consumers/receipts.go +++ b/federationapi/consumers/receipts.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/federationapi/consumers/roomserver.go b/federationapi/consumers/roomserver.go index f1dcb1175..90945a55f 100644 --- a/federationapi/consumers/roomserver.go +++ b/federationapi/consumers/roomserver.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/federationapi/consumers/roomserver_test.go b/federationapi/consumers/roomserver_test.go index bb659b9cd..5c0e46a3e 100644 --- a/federationapi/consumers/roomserver_test.go +++ b/federationapi/consumers/roomserver_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/federationapi/consumers/sendtodevice.go b/federationapi/consumers/sendtodevice.go index 91b28cdbf..0c0a99c24 100644 --- a/federationapi/consumers/sendtodevice.go +++ b/federationapi/consumers/sendtodevice.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/federationapi/consumers/typing.go b/federationapi/consumers/typing.go index 134f2174f..dbe2d1ec4 100644 --- a/federationapi/consumers/typing.go +++ b/federationapi/consumers/typing.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/federationapi/federationapi.go b/federationapi/federationapi.go index d3730c7ca..e30802b31 100644 --- a/federationapi/federationapi.go +++ b/federationapi/federationapi.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package federationapi diff --git a/federationapi/internal/federationclient_test.go b/federationapi/internal/federationclient_test.go index 47efb11da..57d15dd5c 100644 --- a/federationapi/internal/federationclient_test.go +++ b/federationapi/internal/federationclient_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/federationapi/internal/perform_test.go b/federationapi/internal/perform_test.go index 82f9b9db1..7a1d45b46 100644 --- a/federationapi/internal/perform_test.go +++ b/federationapi/internal/perform_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/federationapi/producers/syncapi.go b/federationapi/producers/syncapi.go index ede56436a..154480477 100644 --- a/federationapi/producers/syncapi.go +++ b/federationapi/producers/syncapi.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package producers diff --git a/federationapi/queue/destinationqueue.go b/federationapi/queue/destinationqueue.go index be43aaf1c..aff9c87c3 100644 --- a/federationapi/queue/destinationqueue.go +++ b/federationapi/queue/destinationqueue.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package queue diff --git a/federationapi/queue/queue.go b/federationapi/queue/queue.go index 892c26a2c..99273bbf8 100644 --- a/federationapi/queue/queue.go +++ b/federationapi/queue/queue.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package queue diff --git a/federationapi/queue/queue_test.go b/federationapi/queue/queue_test.go index 7d21a3bb3..80dbe3b54 100644 --- a/federationapi/queue/queue_test.go +++ b/federationapi/queue/queue_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package queue diff --git a/federationapi/routing/backfill.go b/federationapi/routing/backfill.go index bc4138839..f5d70ae68 100644 --- a/federationapi/routing/backfill.go +++ b/federationapi/routing/backfill.go @@ -1,16 +1,7 @@ -// Copyright 2018 New Vector Ltd +// Copyright 2018-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/devices.go b/federationapi/routing/devices.go index a54ff0d9c..5e2fc52e2 100644 --- a/federationapi/routing/devices.go +++ b/federationapi/routing/devices.go @@ -8,7 +8,10 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2024 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/eventauth.go b/federationapi/routing/eventauth.go index 2be3ecdb1..18cb42d66 100644 --- a/federationapi/routing/eventauth.go +++ b/federationapi/routing/eventauth.go @@ -8,7 +8,10 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2024 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/events.go b/federationapi/routing/events.go index f4659f528..2b3d2ddba 100644 --- a/federationapi/routing/events.go +++ b/federationapi/routing/events.go @@ -1,16 +1,7 @@ -// Copyright 2017 New Vector Ltd +// Copyright 2017-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/invite.go b/federationapi/routing/invite.go index 76fadaa93..f668fd778 100644 --- a/federationapi/routing/invite.go +++ b/federationapi/routing/invite.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/join.go b/federationapi/routing/join.go index ce7ad30ff..6ab22ad48 100644 --- a/federationapi/routing/join.go +++ b/federationapi/routing/join.go @@ -1,16 +1,7 @@ -// Copyright 2017 New Vector Ltd +// Copyright 2017-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/keys.go b/federationapi/routing/keys.go index 38a88e4b1..edd9038e5 100644 --- a/federationapi/routing/keys.go +++ b/federationapi/routing/keys.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/leave.go b/federationapi/routing/leave.go index 7c86ba69b..89df7d802 100644 --- a/federationapi/routing/leave.go +++ b/federationapi/routing/leave.go @@ -8,7 +8,10 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2024 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/missingevents.go b/federationapi/routing/missingevents.go index b1cefe7b4..1bd3b8f68 100644 --- a/federationapi/routing/missingevents.go +++ b/federationapi/routing/missingevents.go @@ -8,7 +8,10 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2024 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/openid.go b/federationapi/routing/openid.go index d28f319f5..e70676d6f 100644 --- a/federationapi/routing/openid.go +++ b/federationapi/routing/openid.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/peek.go b/federationapi/routing/peek.go index f5003b147..8c7d87b8e 100644 --- a/federationapi/routing/peek.go +++ b/federationapi/routing/peek.go @@ -1,16 +1,7 @@ -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/profile.go b/federationapi/routing/profile.go index e8c7ff793..81f97caf3 100644 --- a/federationapi/routing/profile.go +++ b/federationapi/routing/profile.go @@ -1,16 +1,7 @@ -// Copyright 2017 New Vector Ltd +// Copyright 2017-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/profile_test.go b/federationapi/routing/profile_test.go index ba13e07fc..ac42602cc 100644 --- a/federationapi/routing/profile_test.go +++ b/federationapi/routing/profile_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing_test diff --git a/federationapi/routing/query.go b/federationapi/routing/query.go index dac9b1b34..c86e944fc 100644 --- a/federationapi/routing/query.go +++ b/federationapi/routing/query.go @@ -1,16 +1,7 @@ -// Copyright 2017 New Vector Ltd +// Copyright 2017-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/query_test.go b/federationapi/routing/query_test.go index fd0894d15..a7b401719 100644 --- a/federationapi/routing/query_test.go +++ b/federationapi/routing/query_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing_test diff --git a/federationapi/routing/routing.go b/federationapi/routing/routing.go index 91718efdb..cfab63b47 100644 --- a/federationapi/routing/routing.go +++ b/federationapi/routing/routing.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/send.go b/federationapi/routing/send.go index 966694541..63c1cf3dd 100644 --- a/federationapi/routing/send.go +++ b/federationapi/routing/send.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/send_test.go b/federationapi/routing/send_test.go index ff4f7bd06..b092746db 100644 --- a/federationapi/routing/send_test.go +++ b/federationapi/routing/send_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing_test diff --git a/federationapi/routing/state.go b/federationapi/routing/state.go index d10910573..d9aa9f9f9 100644 --- a/federationapi/routing/state.go +++ b/federationapi/routing/state.go @@ -8,7 +8,10 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2024 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/threepid.go b/federationapi/routing/threepid.go index 42ba8bfe5..f614a0a6b 100644 --- a/federationapi/routing/threepid.go +++ b/federationapi/routing/threepid.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/routing/version.go b/federationapi/routing/version.go index 906fc2b9b..a96610d4e 100644 --- a/federationapi/routing/version.go +++ b/federationapi/routing/version.go @@ -1,16 +1,7 @@ -// Copyright 2017 New Vector Ltd +// Copyright 2017-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/federationapi/storage/interface.go b/federationapi/storage/interface.go index 5388b4d2b..74c7c4b6c 100644 --- a/federationapi/storage/interface.go +++ b/federationapi/storage/interface.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package storage diff --git a/federationapi/storage/postgres/assumed_offline_table.go b/federationapi/storage/postgres/assumed_offline_table.go index d8d389d86..64a2c9f8c 100644 --- a/federationapi/storage/postgres/assumed_offline_table.go +++ b/federationapi/storage/postgres/assumed_offline_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/blacklist_table.go b/federationapi/storage/postgres/blacklist_table.go index 48b6d72e1..97916e3ed 100644 --- a/federationapi/storage/postgres/blacklist_table.go +++ b/federationapi/storage/postgres/blacklist_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/deltas/2021020411080000_rooms.go b/federationapi/storage/postgres/deltas/2021020411080000_rooms.go index fc894846d..63040545a 100644 --- a/federationapi/storage/postgres/deltas/2021020411080000_rooms.go +++ b/federationapi/storage/postgres/deltas/2021020411080000_rooms.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/federationapi/storage/postgres/deltas/2022042812473400_addexpiresat.go b/federationapi/storage/postgres/deltas/2022042812473400_addexpiresat.go index cf2d94b20..34b6258f2 100644 --- a/federationapi/storage/postgres/deltas/2022042812473400_addexpiresat.go +++ b/federationapi/storage/postgres/deltas/2022042812473400_addexpiresat.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/federationapi/storage/postgres/inbound_peeks_table.go b/federationapi/storage/postgres/inbound_peeks_table.go index a6fffc0e1..58bea7ca4 100644 --- a/federationapi/storage/postgres/inbound_peeks_table.go +++ b/federationapi/storage/postgres/inbound_peeks_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/joined_hosts_table.go b/federationapi/storage/postgres/joined_hosts_table.go index 2b0aebad1..d507bffe2 100644 --- a/federationapi/storage/postgres/joined_hosts_table.go +++ b/federationapi/storage/postgres/joined_hosts_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/notary_server_keys_json_table.go b/federationapi/storage/postgres/notary_server_keys_json_table.go index af98a0d4e..4477355cd 100644 --- a/federationapi/storage/postgres/notary_server_keys_json_table.go +++ b/federationapi/storage/postgres/notary_server_keys_json_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/notary_server_keys_metadata_table.go b/federationapi/storage/postgres/notary_server_keys_metadata_table.go index 47aa82b48..e8946ead5 100644 --- a/federationapi/storage/postgres/notary_server_keys_metadata_table.go +++ b/federationapi/storage/postgres/notary_server_keys_metadata_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/outbound_peeks_table.go b/federationapi/storage/postgres/outbound_peeks_table.go index bd2b10e67..acb8d53d5 100644 --- a/federationapi/storage/postgres/outbound_peeks_table.go +++ b/federationapi/storage/postgres/outbound_peeks_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/queue_edus_table.go b/federationapi/storage/postgres/queue_edus_table.go index 7c57ed0cc..cf6520c32 100644 --- a/federationapi/storage/postgres/queue_edus_table.go +++ b/federationapi/storage/postgres/queue_edus_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/queue_json_table.go b/federationapi/storage/postgres/queue_json_table.go index f92e33d5e..1d5016465 100644 --- a/federationapi/storage/postgres/queue_json_table.go +++ b/federationapi/storage/postgres/queue_json_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/queue_pdus_table.go b/federationapi/storage/postgres/queue_pdus_table.go index a767ec41d..fbc581ae1 100644 --- a/federationapi/storage/postgres/queue_pdus_table.go +++ b/federationapi/storage/postgres/queue_pdus_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/relay_servers_table.go b/federationapi/storage/postgres/relay_servers_table.go index 1a47816e2..d1b1d5cc0 100644 --- a/federationapi/storage/postgres/relay_servers_table.go +++ b/federationapi/storage/postgres/relay_servers_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/server_key_table.go b/federationapi/storage/postgres/server_key_table.go index fa58f1ea2..8afc3a022 100644 --- a/federationapi/storage/postgres/server_key_table.go +++ b/federationapi/storage/postgres/server_key_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/storage.go b/federationapi/storage/postgres/storage.go index 2caa7a055..53ebcddce 100644 --- a/federationapi/storage/postgres/storage.go +++ b/federationapi/storage/postgres/storage.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/federationapi/storage/shared/receipt/receipt.go b/federationapi/storage/shared/receipt/receipt.go index b347269c1..e4d56853b 100644 --- a/federationapi/storage/shared/receipt/receipt.go +++ b/federationapi/storage/shared/receipt/receipt.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // A Receipt contains the NIDs of a call to GetNextTransactionPDUs/EDUs. // We don't actually export the NIDs but we need the caller to be able // to pass them back so that we can clean up if the transaction sends diff --git a/federationapi/storage/shared/storage.go b/federationapi/storage/shared/storage.go index 8c73967c6..f623e2adf 100644 --- a/federationapi/storage/shared/storage.go +++ b/federationapi/storage/shared/storage.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package shared diff --git a/federationapi/storage/shared/storage_edus.go b/federationapi/storage/shared/storage_edus.go index e8d1d3733..2216c926f 100644 --- a/federationapi/storage/shared/storage_edus.go +++ b/federationapi/storage/shared/storage_edus.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package shared diff --git a/federationapi/storage/shared/storage_keys.go b/federationapi/storage/shared/storage_keys.go index 580cf1d84..751d3a5ea 100644 --- a/federationapi/storage/shared/storage_keys.go +++ b/federationapi/storage/shared/storage_keys.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package shared diff --git a/federationapi/storage/shared/storage_pdus.go b/federationapi/storage/shared/storage_pdus.go index 5fabfbf20..680def7f5 100644 --- a/federationapi/storage/shared/storage_pdus.go +++ b/federationapi/storage/shared/storage_pdus.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package shared diff --git a/federationapi/storage/sqlite3/assumed_offline_table.go b/federationapi/storage/sqlite3/assumed_offline_table.go index f8de7f0c5..b374b5c5c 100644 --- a/federationapi/storage/sqlite3/assumed_offline_table.go +++ b/federationapi/storage/sqlite3/assumed_offline_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/blacklist_table.go b/federationapi/storage/sqlite3/blacklist_table.go index 2c65c487c..bc328ab0f 100644 --- a/federationapi/storage/sqlite3/blacklist_table.go +++ b/federationapi/storage/sqlite3/blacklist_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/deltas/2021020411080000_rooms.go b/federationapi/storage/sqlite3/deltas/2021020411080000_rooms.go index fc894846d..63040545a 100644 --- a/federationapi/storage/sqlite3/deltas/2021020411080000_rooms.go +++ b/federationapi/storage/sqlite3/deltas/2021020411080000_rooms.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/federationapi/storage/sqlite3/deltas/2022042812473400_addexpiresat.go b/federationapi/storage/sqlite3/deltas/2022042812473400_addexpiresat.go index d8be4695e..d0089a551 100644 --- a/federationapi/storage/sqlite3/deltas/2022042812473400_addexpiresat.go +++ b/federationapi/storage/sqlite3/deltas/2022042812473400_addexpiresat.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/federationapi/storage/sqlite3/inbound_peeks_table.go b/federationapi/storage/sqlite3/inbound_peeks_table.go index e58d53778..14d50189d 100644 --- a/federationapi/storage/sqlite3/inbound_peeks_table.go +++ b/federationapi/storage/sqlite3/inbound_peeks_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/joined_hosts_table.go b/federationapi/storage/sqlite3/joined_hosts_table.go index 418194312..0d662dbe3 100644 --- a/federationapi/storage/sqlite3/joined_hosts_table.go +++ b/federationapi/storage/sqlite3/joined_hosts_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/notary_server_keys_json_table.go b/federationapi/storage/sqlite3/notary_server_keys_json_table.go index ad6d1b57f..0d856c4c7 100644 --- a/federationapi/storage/sqlite3/notary_server_keys_json_table.go +++ b/federationapi/storage/sqlite3/notary_server_keys_json_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go b/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go index d9b98fc4f..06fa5e980 100644 --- a/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go +++ b/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/outbound_peeks_table.go b/federationapi/storage/sqlite3/outbound_peeks_table.go index b6684e9b3..ae476fd38 100644 --- a/federationapi/storage/sqlite3/outbound_peeks_table.go +++ b/federationapi/storage/sqlite3/outbound_peeks_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/queue_edus_table.go b/federationapi/storage/sqlite3/queue_edus_table.go index f500a6317..aa04b3652 100644 --- a/federationapi/storage/sqlite3/queue_edus_table.go +++ b/federationapi/storage/sqlite3/queue_edus_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/queue_json_table.go b/federationapi/storage/sqlite3/queue_json_table.go index 33ae06131..851309a95 100644 --- a/federationapi/storage/sqlite3/queue_json_table.go +++ b/federationapi/storage/sqlite3/queue_json_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/queue_pdus_table.go b/federationapi/storage/sqlite3/queue_pdus_table.go index 92075ff90..353f39757 100644 --- a/federationapi/storage/sqlite3/queue_pdus_table.go +++ b/federationapi/storage/sqlite3/queue_pdus_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/relay_servers_table.go b/federationapi/storage/sqlite3/relay_servers_table.go index 232db32af..91394b765 100644 --- a/federationapi/storage/sqlite3/relay_servers_table.go +++ b/federationapi/storage/sqlite3/relay_servers_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/server_key_table.go b/federationapi/storage/sqlite3/server_key_table.go index 65a854ce1..eb6f3fa2a 100644 --- a/federationapi/storage/sqlite3/server_key_table.go +++ b/federationapi/storage/sqlite3/server_key_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/storage.go b/federationapi/storage/sqlite3/storage.go index 524bf1d5b..3ec83a04b 100644 --- a/federationapi/storage/sqlite3/storage.go +++ b/federationapi/storage/sqlite3/storage.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/storage.go b/federationapi/storage/storage.go index f926b62e7..6232a2f27 100644 --- a/federationapi/storage/storage.go +++ b/federationapi/storage/storage.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !wasm // +build !wasm diff --git a/federationapi/storage/storage_wasm.go b/federationapi/storage/storage_wasm.go index e19a45642..5035ea3f2 100644 --- a/federationapi/storage/storage_wasm.go +++ b/federationapi/storage/storage_wasm.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package storage diff --git a/federationapi/storage/tables/interface.go b/federationapi/storage/tables/interface.go index f8de42da7..a9fef1982 100644 --- a/federationapi/storage/tables/interface.go +++ b/federationapi/storage/tables/interface.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package tables diff --git a/federationapi/types/types.go b/federationapi/types/types.go index 20f92e804..8362e1b5d 100644 --- a/federationapi/types/types.go +++ b/federationapi/types/types.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package types diff --git a/internal/caching/cache_typing.go b/internal/caching/cache_typing.go index bd6a5fc1b..4744ba63b 100644 --- a/internal/caching/cache_typing.go +++ b/internal/caching/cache_typing.go @@ -1,18 +1,10 @@ +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // Copyright 2017 Vector Creations Ltd -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package caching diff --git a/internal/caching/cache_typing_test.go b/internal/caching/cache_typing_test.go index 2cef32d3e..a1928b40c 100644 --- a/internal/caching/cache_typing_test.go +++ b/internal/caching/cache_typing_test.go @@ -1,18 +1,10 @@ +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // Copyright 2017 Vector Creations Ltd -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package caching diff --git a/internal/caching/caches.go b/internal/caching/caches.go index 16e547578..bf35b5388 100644 --- a/internal/caching/caches.go +++ b/internal/caching/caches.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package caching diff --git a/internal/caching/impl_ristretto.go b/internal/caching/impl_ristretto.go index 97ea9548f..23eb3c2fa 100644 --- a/internal/caching/impl_ristretto.go +++ b/internal/caching/impl_ristretto.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package caching diff --git a/internal/eventutil/eventcontent.go b/internal/eventutil/eventcontent.go index e3c80f1d0..c17097a5b 100644 --- a/internal/eventutil/eventcontent.go +++ b/internal/eventutil/eventcontent.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package eventutil diff --git a/internal/eventutil/events.go b/internal/eventutil/events.go index 40d62fd68..d7b9c462a 100644 --- a/internal/eventutil/events.go +++ b/internal/eventutil/events.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package eventutil diff --git a/internal/eventutil/types.go b/internal/eventutil/types.go index e43c0412e..d1a0049d8 100644 --- a/internal/eventutil/types.go +++ b/internal/eventutil/types.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package eventutil diff --git a/internal/fulltext/bleve.go b/internal/fulltext/bleve.go index d2807198a..98329429c 100644 --- a/internal/fulltext/bleve.go +++ b/internal/fulltext/bleve.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !wasm // +build !wasm diff --git a/internal/fulltext/bleve_test.go b/internal/fulltext/bleve_test.go index decb5eccb..e32a257eb 100644 --- a/internal/fulltext/bleve_test.go +++ b/internal/fulltext/bleve_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package fulltext_test diff --git a/internal/fulltext/bleve_wasm.go b/internal/fulltext/bleve_wasm.go index 12709900b..782524c04 100644 --- a/internal/fulltext/bleve_wasm.go +++ b/internal/fulltext/bleve_wasm.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package fulltext diff --git a/internal/hooks/hooks.go b/internal/hooks/hooks.go index 802ff8187..cfba601bb 100644 --- a/internal/hooks/hooks.go +++ b/internal/hooks/hooks.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // Package hooks exposes places in Dendrite where custom code can be executed, useful for MSCs. // Hooks can only be run in monolith mode. diff --git a/internal/httputil/httpapi.go b/internal/httputil/httpapi.go index 034f19f1f..5cf977856 100644 --- a/internal/httputil/httpapi.go +++ b/internal/httputil/httpapi.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package httputil diff --git a/internal/httputil/httpapi_test.go b/internal/httputil/httpapi_test.go index de6ccf9b4..c60c3eb6d 100644 --- a/internal/httputil/httpapi_test.go +++ b/internal/httputil/httpapi_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package httputil diff --git a/internal/httputil/paths.go b/internal/httputil/paths.go index d06875428..b6e175c6b 100644 --- a/internal/httputil/paths.go +++ b/internal/httputil/paths.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package httputil diff --git a/internal/httputil/routing.go b/internal/httputil/routing.go index f5f1c6528..53d5d3caa 100644 --- a/internal/httputil/routing.go +++ b/internal/httputil/routing.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package httputil diff --git a/internal/log.go b/internal/log.go index 8fe98f20c..150dee750 100644 --- a/internal/log.go +++ b/internal/log.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/internal/log_unix.go b/internal/log_unix.go index 3f15063d1..f4a22c8a4 100644 --- a/internal/log_unix.go +++ b/internal/log_unix.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !windows // +build !windows diff --git a/internal/log_windows.go b/internal/log_windows.go index e1f0098a1..baeebbc97 100644 --- a/internal/log_windows.go +++ b/internal/log_windows.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/internal/sqlutil/connection_manager.go b/internal/sqlutil/connection_manager.go index 437da6c80..4554eeb47 100644 --- a/internal/sqlutil/connection_manager.go +++ b/internal/sqlutil/connection_manager.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlutil diff --git a/internal/sqlutil/migrate.go b/internal/sqlutil/migrate.go index 735fb4927..1042dbd0f 100644 --- a/internal/sqlutil/migrate.go +++ b/internal/sqlutil/migrate.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlutil diff --git a/internal/sqlutil/sql.go b/internal/sqlutil/sql.go index 81c055edd..38f7c364c 100644 --- a/internal/sqlutil/sql.go +++ b/internal/sqlutil/sql.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlutil diff --git a/internal/sqlutil/unique_constraint.go b/internal/sqlutil/unique_constraint.go index 767a586ec..2defe48ca 100644 --- a/internal/sqlutil/unique_constraint.go +++ b/internal/sqlutil/unique_constraint.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !wasm && !cgo // +build !wasm,!cgo diff --git a/internal/sqlutil/unique_constraint_cgo.go b/internal/sqlutil/unique_constraint_cgo.go index edeb7c450..bab7fa028 100644 --- a/internal/sqlutil/unique_constraint_cgo.go +++ b/internal/sqlutil/unique_constraint_cgo.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !wasm && cgo // +build !wasm,cgo diff --git a/internal/sqlutil/unique_constraint_wasm.go b/internal/sqlutil/unique_constraint_wasm.go index ef393fa59..86030a391 100644 --- a/internal/sqlutil/unique_constraint_wasm.go +++ b/internal/sqlutil/unique_constraint_wasm.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build wasm // +build wasm diff --git a/internal/sqlutil/uri.go b/internal/sqlutil/uri.go index 44910f4a9..dd1b552a6 100644 --- a/internal/sqlutil/uri.go +++ b/internal/sqlutil/uri.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlutil diff --git a/internal/tracing.go b/internal/tracing.go index 4e062aed3..537c0127a 100644 --- a/internal/tracing.go +++ b/internal/tracing.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/internal/transactionrequest.go b/internal/transactionrequest.go index 0663c2dcb..3dcf1b725 100644 --- a/internal/transactionrequest.go +++ b/internal/transactionrequest.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/internal/transactionrequest_test.go b/internal/transactionrequest_test.go index 8dd100d11..1489baa05 100644 --- a/internal/transactionrequest_test.go +++ b/internal/transactionrequest_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/internal/transactions/transactions.go b/internal/transactions/transactions.go index 7ff6f5044..479ade7b9 100644 --- a/internal/transactions/transactions.go +++ b/internal/transactions/transactions.go @@ -8,7 +8,10 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2024 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package transactions diff --git a/internal/transactions/transactions_test.go b/internal/transactions/transactions_test.go index c552550ac..e11f79c8e 100644 --- a/internal/transactions/transactions_test.go +++ b/internal/transactions/transactions_test.go @@ -8,7 +8,10 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2024 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package transactions diff --git a/internal/validate.go b/internal/validate.go index c831565f5..855ec35fd 100644 --- a/internal/validate.go +++ b/internal/validate.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/mediaapi/fileutils/fileutils.go b/mediaapi/fileutils/fileutils.go index 2e719dc82..f3e26b968 100644 --- a/mediaapi/fileutils/fileutils.go +++ b/mediaapi/fileutils/fileutils.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package fileutils diff --git a/mediaapi/mediaapi.go b/mediaapi/mediaapi.go index 8b843e907..86f595d15 100644 --- a/mediaapi/mediaapi.go +++ b/mediaapi/mediaapi.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package mediaapi diff --git a/mediaapi/routing/download.go b/mediaapi/routing/download.go index c3ac3cdc7..f2b61a781 100644 --- a/mediaapi/routing/download.go +++ b/mediaapi/routing/download.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/mediaapi/routing/routing.go b/mediaapi/routing/routing.go index 2867df605..c5edea213 100644 --- a/mediaapi/routing/routing.go +++ b/mediaapi/routing/routing.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/mediaapi/routing/upload.go b/mediaapi/routing/upload.go index 5ac1d076b..0ed0450c5 100644 --- a/mediaapi/routing/upload.go +++ b/mediaapi/routing/upload.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/mediaapi/storage/interface.go b/mediaapi/storage/interface.go index cf3e7df57..3baa0022b 100644 --- a/mediaapi/storage/interface.go +++ b/mediaapi/storage/interface.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package storage diff --git a/mediaapi/storage/postgres/media_repository_table.go b/mediaapi/storage/postgres/media_repository_table.go index 0583dd017..018a369d5 100644 --- a/mediaapi/storage/postgres/media_repository_table.go +++ b/mediaapi/storage/postgres/media_repository_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/mediaapi/storage/postgres/mediaapi.go b/mediaapi/storage/postgres/mediaapi.go index e2a2b25ce..ea4ef3286 100644 --- a/mediaapi/storage/postgres/mediaapi.go +++ b/mediaapi/storage/postgres/mediaapi.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/mediaapi/storage/postgres/thumbnail_table.go b/mediaapi/storage/postgres/thumbnail_table.go index 854485528..67a5dcaf8 100644 --- a/mediaapi/storage/postgres/thumbnail_table.go +++ b/mediaapi/storage/postgres/thumbnail_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/mediaapi/storage/shared/mediaapi.go b/mediaapi/storage/shared/mediaapi.go index bdd7f317b..905d0261f 100644 --- a/mediaapi/storage/shared/mediaapi.go +++ b/mediaapi/storage/shared/mediaapi.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package shared diff --git a/mediaapi/storage/sqlite3/media_repository_table.go b/mediaapi/storage/sqlite3/media_repository_table.go index 625688cd7..cd7e77350 100644 --- a/mediaapi/storage/sqlite3/media_repository_table.go +++ b/mediaapi/storage/sqlite3/media_repository_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/mediaapi/storage/sqlite3/mediaapi.go b/mediaapi/storage/sqlite3/mediaapi.go index 086beb8e2..0be1c2a64 100644 --- a/mediaapi/storage/sqlite3/mediaapi.go +++ b/mediaapi/storage/sqlite3/mediaapi.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/mediaapi/storage/sqlite3/thumbnail_table.go b/mediaapi/storage/sqlite3/thumbnail_table.go index 259d55b73..9c3467a69 100644 --- a/mediaapi/storage/sqlite3/thumbnail_table.go +++ b/mediaapi/storage/sqlite3/thumbnail_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/mediaapi/storage/storage.go b/mediaapi/storage/storage.go index 71ab72077..d543e4633 100644 --- a/mediaapi/storage/storage.go +++ b/mediaapi/storage/storage.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !wasm // +build !wasm diff --git a/mediaapi/storage/storage_wasm.go b/mediaapi/storage/storage_wasm.go index 47ee3792c..905c5b222 100644 --- a/mediaapi/storage/storage_wasm.go +++ b/mediaapi/storage/storage_wasm.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package storage diff --git a/mediaapi/storage/tables/interface.go b/mediaapi/storage/tables/interface.go index 2ff8039b4..f018e5493 100644 --- a/mediaapi/storage/tables/interface.go +++ b/mediaapi/storage/tables/interface.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package tables diff --git a/mediaapi/thumbnailer/thumbnailer.go b/mediaapi/thumbnailer/thumbnailer.go index 58407ce8b..b469d740f 100644 --- a/mediaapi/thumbnailer/thumbnailer.go +++ b/mediaapi/thumbnailer/thumbnailer.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package thumbnailer diff --git a/mediaapi/thumbnailer/thumbnailer_bimg.go b/mediaapi/thumbnailer/thumbnailer_bimg.go index fa1acbf08..f8e688505 100644 --- a/mediaapi/thumbnailer/thumbnailer_bimg.go +++ b/mediaapi/thumbnailer/thumbnailer_bimg.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build bimg // +build bimg diff --git a/mediaapi/thumbnailer/thumbnailer_nfnt.go b/mediaapi/thumbnailer/thumbnailer_nfnt.go index beae88c5c..825fe1a9b 100644 --- a/mediaapi/thumbnailer/thumbnailer_nfnt.go +++ b/mediaapi/thumbnailer/thumbnailer_nfnt.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !bimg // +build !bimg diff --git a/mediaapi/types/types.go b/mediaapi/types/types.go index e1c29e0f6..040014913 100644 --- a/mediaapi/types/types.go +++ b/mediaapi/types/types.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package types diff --git a/relayapi/api/api.go b/relayapi/api/api.go index 83ff2890b..ae00d123f 100644 --- a/relayapi/api/api.go +++ b/relayapi/api/api.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package api diff --git a/relayapi/internal/api.go b/relayapi/internal/api.go index 603309cf3..13e88fd26 100644 --- a/relayapi/internal/api.go +++ b/relayapi/internal/api.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/relayapi/internal/perform.go b/relayapi/internal/perform.go index 79d600abf..5de23508a 100644 --- a/relayapi/internal/perform.go +++ b/relayapi/internal/perform.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/relayapi/internal/perform_test.go b/relayapi/internal/perform_test.go index f97c5aa9e..41431d1bb 100644 --- a/relayapi/internal/perform_test.go +++ b/relayapi/internal/perform_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/relayapi/relayapi.go b/relayapi/relayapi.go index 440227495..bceb42ed3 100644 --- a/relayapi/relayapi.go +++ b/relayapi/relayapi.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package relayapi diff --git a/relayapi/relayapi_test.go b/relayapi/relayapi_test.go index 9d67cdf95..2aa55666a 100644 --- a/relayapi/relayapi_test.go +++ b/relayapi/relayapi_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package relayapi_test diff --git a/relayapi/routing/relaytxn.go b/relayapi/routing/relaytxn.go index 2f3225b62..760eb1f1a 100644 --- a/relayapi/routing/relaytxn.go +++ b/relayapi/routing/relaytxn.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/relayapi/routing/relaytxn_test.go b/relayapi/routing/relaytxn_test.go index 1041d8e7e..5b58db501 100644 --- a/relayapi/routing/relaytxn_test.go +++ b/relayapi/routing/relaytxn_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing_test diff --git a/relayapi/routing/routing.go b/relayapi/routing/routing.go index 92476d6c2..02391fb4c 100644 --- a/relayapi/routing/routing.go +++ b/relayapi/routing/routing.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/relayapi/routing/sendrelay.go b/relayapi/routing/sendrelay.go index 4a742dede..72673393f 100644 --- a/relayapi/routing/sendrelay.go +++ b/relayapi/routing/sendrelay.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/relayapi/routing/sendrelay_test.go b/relayapi/routing/sendrelay_test.go index cac109e19..cb51a7ad4 100644 --- a/relayapi/routing/sendrelay_test.go +++ b/relayapi/routing/sendrelay_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing_test diff --git a/relayapi/storage/interface.go b/relayapi/storage/interface.go index bc1722cd9..5d9fb9ca8 100644 --- a/relayapi/storage/interface.go +++ b/relayapi/storage/interface.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package storage diff --git a/relayapi/storage/postgres/relay_queue_json_table.go b/relayapi/storage/postgres/relay_queue_json_table.go index 94ae41407..a1424c339 100644 --- a/relayapi/storage/postgres/relay_queue_json_table.go +++ b/relayapi/storage/postgres/relay_queue_json_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/relayapi/storage/postgres/relay_queue_table.go b/relayapi/storage/postgres/relay_queue_table.go index 5873af760..04bcee0bf 100644 --- a/relayapi/storage/postgres/relay_queue_table.go +++ b/relayapi/storage/postgres/relay_queue_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/relayapi/storage/postgres/storage.go b/relayapi/storage/postgres/storage.go index dd30c1b56..8ed2fe4e3 100644 --- a/relayapi/storage/postgres/storage.go +++ b/relayapi/storage/postgres/storage.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/relayapi/storage/shared/storage.go b/relayapi/storage/shared/storage.go index fc1f12e74..df63432e6 100644 --- a/relayapi/storage/shared/storage.go +++ b/relayapi/storage/shared/storage.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package shared diff --git a/relayapi/storage/sqlite3/relay_queue_json_table.go b/relayapi/storage/sqlite3/relay_queue_json_table.go index a1af82aa0..ac91edb9e 100644 --- a/relayapi/storage/sqlite3/relay_queue_json_table.go +++ b/relayapi/storage/sqlite3/relay_queue_json_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/relayapi/storage/sqlite3/relay_queue_table.go b/relayapi/storage/sqlite3/relay_queue_table.go index 30482ae97..3fced1c2e 100644 --- a/relayapi/storage/sqlite3/relay_queue_table.go +++ b/relayapi/storage/sqlite3/relay_queue_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/relayapi/storage/sqlite3/storage.go b/relayapi/storage/sqlite3/storage.go index 69df401e6..29dd2504e 100644 --- a/relayapi/storage/sqlite3/storage.go +++ b/relayapi/storage/sqlite3/storage.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/relayapi/storage/storage.go b/relayapi/storage/storage.go index 4eccd002d..d000df0c6 100644 --- a/relayapi/storage/storage.go +++ b/relayapi/storage/storage.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !wasm // +build !wasm diff --git a/relayapi/storage/storage_wasm.go b/relayapi/storage/storage_wasm.go index 7e7323347..d57922fd7 100644 --- a/relayapi/storage/storage_wasm.go +++ b/relayapi/storage/storage_wasm.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package storage diff --git a/relayapi/storage/tables/interface.go b/relayapi/storage/tables/interface.go index 27f43a8d5..278757f35 100644 --- a/relayapi/storage/tables/interface.go +++ b/relayapi/storage/tables/interface.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package tables diff --git a/relayapi/storage/tables/relay_queue_json_table_test.go b/relayapi/storage/tables/relay_queue_json_table_test.go index 97af7eaeb..b60bf55e4 100644 --- a/relayapi/storage/tables/relay_queue_json_table_test.go +++ b/relayapi/storage/tables/relay_queue_json_table_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package tables_test diff --git a/relayapi/storage/tables/relay_queue_table_test.go b/relayapi/storage/tables/relay_queue_table_test.go index d196eaf57..7d36e6a2a 100644 --- a/relayapi/storage/tables/relay_queue_table_test.go +++ b/relayapi/storage/tables/relay_queue_table_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package tables_test diff --git a/roomserver/acls/acls.go b/roomserver/acls/acls.go index 4950e6231..0ff9908ba 100644 --- a/roomserver/acls/acls.go +++ b/roomserver/acls/acls.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package acls diff --git a/roomserver/acls/acls_test.go b/roomserver/acls/acls_test.go index 7fd20f114..f8b6b67fb 100644 --- a/roomserver/acls/acls_test.go +++ b/roomserver/acls/acls_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package acls diff --git a/roomserver/api/alias.go b/roomserver/api/alias.go index 6269d0b04..c7e6f31f5 100644 --- a/roomserver/api/alias.go +++ b/roomserver/api/alias.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package api diff --git a/roomserver/api/input.go b/roomserver/api/input.go index 8947ad624..7cfb57a8c 100644 --- a/roomserver/api/input.go +++ b/roomserver/api/input.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // Package api provides the types that are used to communicate with the roomserver. package api diff --git a/roomserver/api/output.go b/roomserver/api/output.go index 852b64206..1c5ff1aa3 100644 --- a/roomserver/api/output.go +++ b/roomserver/api/output.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package api diff --git a/roomserver/api/query.go b/roomserver/api/query.go index c4c019f99..c599ab3d6 100644 --- a/roomserver/api/query.go +++ b/roomserver/api/query.go @@ -1,18 +1,10 @@ -// Copyright 2017 Vector Creations Ltd +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 +// Copyright 2017 Vector Creations Ltd // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package api diff --git a/roomserver/api/wrapper.go b/roomserver/api/wrapper.go index 4979d18c7..edaeca811 100644 --- a/roomserver/api/wrapper.go +++ b/roomserver/api/wrapper.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package api diff --git a/roomserver/auth/auth.go b/roomserver/auth/auth.go index d5172dab9..e605074f7 100644 --- a/roomserver/auth/auth.go +++ b/roomserver/auth/auth.go @@ -8,7 +8,10 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2024 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package auth diff --git a/roomserver/internal/alias.go b/roomserver/internal/alias.go index 5ceda7e01..04f68cf1f 100644 --- a/roomserver/internal/alias.go +++ b/roomserver/internal/alias.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/roomserver/internal/helpers/auth.go b/roomserver/internal/helpers/auth.go index 9da751b1a..eef893a98 100644 --- a/roomserver/internal/helpers/auth.go +++ b/roomserver/internal/helpers/auth.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package helpers diff --git a/roomserver/internal/helpers/auth_test.go b/roomserver/internal/helpers/auth_test.go index 2a1c3ea49..29f4db2f1 100644 --- a/roomserver/internal/helpers/auth_test.go +++ b/roomserver/internal/helpers/auth_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package helpers diff --git a/roomserver/internal/input/input.go b/roomserver/internal/input/input.go index 104ce94e5..fe1e1b3d9 100644 --- a/roomserver/internal/input/input.go +++ b/roomserver/internal/input/input.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // Package input contains the code processes new room events package input diff --git a/roomserver/internal/input/input_events.go b/roomserver/internal/input/input_events.go index 657ca8719..9d302ee7b 100644 --- a/roomserver/internal/input/input_events.go +++ b/roomserver/internal/input/input_events.go @@ -1,18 +1,10 @@ -// Copyright 2017 Vector Creations Ltd +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 +// Copyright 2017 Vector Creations Ltd // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package input diff --git a/roomserver/internal/input/input_latest_events.go b/roomserver/internal/input/input_latest_events.go index e9856cc5d..ab9a440d7 100644 --- a/roomserver/internal/input/input_latest_events.go +++ b/roomserver/internal/input/input_latest_events.go @@ -1,18 +1,10 @@ -// Copyright 2017 Vector Creations Ltd +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 +// Copyright 2017 Vector Creations Ltd // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package input diff --git a/roomserver/internal/input/input_membership.go b/roomserver/internal/input/input_membership.go index 4cfc2cda9..44d58dea1 100644 --- a/roomserver/internal/input/input_membership.go +++ b/roomserver/internal/input/input_membership.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package input diff --git a/roomserver/internal/perform/perform_admin.go b/roomserver/internal/perform/perform_admin.go index 1b8817234..eaed4c758 100644 --- a/roomserver/internal/perform/perform_admin.go +++ b/roomserver/internal/perform/perform_admin.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_backfill.go b/roomserver/internal/perform/perform_backfill.go index dafa58736..c609c6556 100644 --- a/roomserver/internal/perform/perform_backfill.go +++ b/roomserver/internal/perform/perform_backfill.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_create_room.go b/roomserver/internal/perform/perform_create_room.go index 093082f90..301800247 100644 --- a/roomserver/internal/perform/perform_create_room.go +++ b/roomserver/internal/perform/perform_create_room.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_forget.go b/roomserver/internal/perform/perform_forget.go index e970d9a88..297449903 100644 --- a/roomserver/internal/perform/perform_forget.go +++ b/roomserver/internal/perform/perform_forget.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_inbound_peek.go b/roomserver/internal/perform/perform_inbound_peek.go index 7fbec3710..78aefce8a 100644 --- a/roomserver/internal/perform/perform_inbound_peek.go +++ b/roomserver/internal/perform/perform_inbound_peek.go @@ -1,16 +1,7 @@ -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_invite.go b/roomserver/internal/perform/perform_invite.go index 86563e8c3..cda107993 100644 --- a/roomserver/internal/perform/perform_invite.go +++ b/roomserver/internal/perform/perform_invite.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_join.go b/roomserver/internal/perform/perform_join.go index 23988e467..79aa4e143 100644 --- a/roomserver/internal/perform/perform_join.go +++ b/roomserver/internal/perform/perform_join.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_leave.go b/roomserver/internal/perform/perform_leave.go index 5bea00445..738223fa4 100644 --- a/roomserver/internal/perform/perform_leave.go +++ b/roomserver/internal/perform/perform_leave.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_peek.go b/roomserver/internal/perform/perform_peek.go index 88fa2a431..d124c9c37 100644 --- a/roomserver/internal/perform/perform_peek.go +++ b/roomserver/internal/perform/perform_peek.go @@ -1,16 +1,7 @@ -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_publish.go b/roomserver/internal/perform/perform_publish.go index 297a4a189..baf1da87e 100644 --- a/roomserver/internal/perform/perform_publish.go +++ b/roomserver/internal/perform/perform_publish.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_unpeek.go b/roomserver/internal/perform/perform_unpeek.go index 1ea8079d4..55b6437ef 100644 --- a/roomserver/internal/perform/perform_unpeek.go +++ b/roomserver/internal/perform/perform_unpeek.go @@ -1,16 +1,7 @@ -// Copyright 2020 New Vector Ltd +// Copyright 2020-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_upgrade.go b/roomserver/internal/perform/perform_upgrade.go index 9d7c7b567..63283b8b3 100644 --- a/roomserver/internal/perform/perform_upgrade.go +++ b/roomserver/internal/perform/perform_upgrade.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package perform diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go index 886d00492..74a8c739d 100644 --- a/roomserver/internal/query/query.go +++ b/roomserver/internal/query/query.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package query diff --git a/roomserver/internal/query/query_room_hierarchy.go b/roomserver/internal/query/query_room_hierarchy.go index 3fc613192..ab57e5c49 100644 --- a/roomserver/internal/query/query_room_hierarchy.go +++ b/roomserver/internal/query/query_room_hierarchy.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package query diff --git a/roomserver/internal/query/query_test.go b/roomserver/internal/query/query_test.go index 296960b2f..a1cfd464f 100644 --- a/roomserver/internal/query/query_test.go +++ b/roomserver/internal/query/query_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package query diff --git a/roomserver/producers/roomevent.go b/roomserver/producers/roomevent.go index 894e6d81b..bec92bb2a 100644 --- a/roomserver/producers/roomevent.go +++ b/roomserver/producers/roomevent.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package producers diff --git a/roomserver/roomserver.go b/roomserver/roomserver.go index 07c5d6561..da45aa716 100644 --- a/roomserver/roomserver.go +++ b/roomserver/roomserver.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package roomserver diff --git a/roomserver/state/state.go b/roomserver/state/state.go index dfd439a22..6f236868a 100644 --- a/roomserver/state/state.go +++ b/roomserver/state/state.go @@ -1,18 +1,10 @@ -// Copyright 2017 Vector Creations Ltd +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 +// Copyright 2017 Vector Creations Ltd // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package state diff --git a/roomserver/state/state_test.go b/roomserver/state/state_test.go index c57056786..27197576b 100644 --- a/roomserver/state/state_test.go +++ b/roomserver/state/state_test.go @@ -1,18 +1,10 @@ -// Copyright 2017 Vector Creations Ltd +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 +// Copyright 2017 Vector Creations Ltd // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package state diff --git a/roomserver/storage/interface.go b/roomserver/storage/interface.go index ab105e6f9..5cbca3a5b 100644 --- a/roomserver/storage/interface.go +++ b/roomserver/storage/interface.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package storage diff --git a/roomserver/storage/postgres/deltas/20201028212440_add_forgotten_column.go b/roomserver/storage/postgres/deltas/20201028212440_add_forgotten_column.go index 61d4dba87..a28e89b5f 100644 --- a/roomserver/storage/postgres/deltas/20201028212440_add_forgotten_column.go +++ b/roomserver/storage/postgres/deltas/20201028212440_add_forgotten_column.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go b/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go index 355c49b14..eb7b27abf 100644 --- a/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go +++ b/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/roomserver/storage/postgres/deltas/20221027084407_published_appservice.go b/roomserver/storage/postgres/deltas/20221027084407_published_appservice.go index 687ee9024..59b1a8d4e 100644 --- a/roomserver/storage/postgres/deltas/20221027084407_published_appservice.go +++ b/roomserver/storage/postgres/deltas/20221027084407_published_appservice.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/roomserver/storage/postgres/deltas/20230131091021_published_appservice_pkey.go b/roomserver/storage/postgres/deltas/20230131091021_published_appservice_pkey.go index add66446b..d6d7562d9 100644 --- a/roomserver/storage/postgres/deltas/20230131091021_published_appservice_pkey.go +++ b/roomserver/storage/postgres/deltas/20230131091021_published_appservice_pkey.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha.go b/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha.go index 1b1dd44d3..5951846f1 100644 --- a/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha.go +++ b/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/roomserver/storage/postgres/event_json_table.go b/roomserver/storage/postgres/event_json_table.go index 5f069ca10..92ca30bb5 100644 --- a/roomserver/storage/postgres/event_json_table.go +++ b/roomserver/storage/postgres/event_json_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/event_state_keys_table.go b/roomserver/storage/postgres/event_state_keys_table.go index 338e11b82..4ac3ff827 100644 --- a/roomserver/storage/postgres/event_state_keys_table.go +++ b/roomserver/storage/postgres/event_state_keys_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/event_types_table.go b/roomserver/storage/postgres/event_types_table.go index 15ab7fd8e..d9b41b3bf 100644 --- a/roomserver/storage/postgres/event_types_table.go +++ b/roomserver/storage/postgres/event_types_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/events_table.go b/roomserver/storage/postgres/events_table.go index 180a03cd6..7bd1f8f36 100644 --- a/roomserver/storage/postgres/events_table.go +++ b/roomserver/storage/postgres/events_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/invite_table.go b/roomserver/storage/postgres/invite_table.go index 009fd1ac1..8f2a0f5f1 100644 --- a/roomserver/storage/postgres/invite_table.go +++ b/roomserver/storage/postgres/invite_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/membership_table.go b/roomserver/storage/postgres/membership_table.go index 1a96e3527..ebb12e0e4 100644 --- a/roomserver/storage/postgres/membership_table.go +++ b/roomserver/storage/postgres/membership_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/previous_events_table.go b/roomserver/storage/postgres/previous_events_table.go index ceb5e26ba..34dfe4417 100644 --- a/roomserver/storage/postgres/previous_events_table.go +++ b/roomserver/storage/postgres/previous_events_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/published_table.go b/roomserver/storage/postgres/published_table.go index eca81d81f..39ca89a7a 100644 --- a/roomserver/storage/postgres/published_table.go +++ b/roomserver/storage/postgres/published_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/purge_statements.go b/roomserver/storage/postgres/purge_statements.go index 9ca8d0346..8e15cd857 100644 --- a/roomserver/storage/postgres/purge_statements.go +++ b/roomserver/storage/postgres/purge_statements.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/redactions_table.go b/roomserver/storage/postgres/redactions_table.go index 6e2f6712d..e01b53eea 100644 --- a/roomserver/storage/postgres/redactions_table.go +++ b/roomserver/storage/postgres/redactions_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/reported_events_table.go b/roomserver/storage/postgres/reported_events_table.go index c46f47b34..956141e15 100644 --- a/roomserver/storage/postgres/reported_events_table.go +++ b/roomserver/storage/postgres/reported_events_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/room_aliases_table.go b/roomserver/storage/postgres/room_aliases_table.go index a84929f61..ebac3c62d 100644 --- a/roomserver/storage/postgres/room_aliases_table.go +++ b/roomserver/storage/postgres/room_aliases_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/rooms_table.go b/roomserver/storage/postgres/rooms_table.go index 4de6dee46..62d0bb82f 100644 --- a/roomserver/storage/postgres/rooms_table.go +++ b/roomserver/storage/postgres/rooms_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/state_block_table.go b/roomserver/storage/postgres/state_block_table.go index 5af48f031..3845d4160 100644 --- a/roomserver/storage/postgres/state_block_table.go +++ b/roomserver/storage/postgres/state_block_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/state_snapshot_table.go b/roomserver/storage/postgres/state_snapshot_table.go index 32ed06a13..9ec86ead3 100644 --- a/roomserver/storage/postgres/state_snapshot_table.go +++ b/roomserver/storage/postgres/state_snapshot_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/storage.go b/roomserver/storage/postgres/storage.go index 1068230f7..333067fc2 100644 --- a/roomserver/storage/postgres/storage.go +++ b/roomserver/storage/postgres/storage.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implie -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/user_room_keys_table.go b/roomserver/storage/postgres/user_room_keys_table.go index f8befc46b..b223540cb 100644 --- a/roomserver/storage/postgres/user_room_keys_table.go +++ b/roomserver/storage/postgres/user_room_keys_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/roomserver/storage/shared/prepare.go b/roomserver/storage/shared/prepare.go index 65ceec1cc..ef7ec13bd 100644 --- a/roomserver/storage/shared/prepare.go +++ b/roomserver/storage/shared/prepare.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package shared diff --git a/roomserver/storage/sqlite3/deltas/20201028212440_add_forgotten_column.go b/roomserver/storage/sqlite3/deltas/20201028212440_add_forgotten_column.go index 4c002e33d..5f261319b 100644 --- a/roomserver/storage/sqlite3/deltas/20201028212440_add_forgotten_column.go +++ b/roomserver/storage/sqlite3/deltas/20201028212440_add_forgotten_column.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/roomserver/storage/sqlite3/deltas/2021041615092700_state_blocks_refactor.go b/roomserver/storage/sqlite3/deltas/2021041615092700_state_blocks_refactor.go index 00978121f..ff0cd354a 100644 --- a/roomserver/storage/sqlite3/deltas/2021041615092700_state_blocks_refactor.go +++ b/roomserver/storage/sqlite3/deltas/2021041615092700_state_blocks_refactor.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/roomserver/storage/sqlite3/deltas/20221027084407_published_appservice.go b/roomserver/storage/sqlite3/deltas/20221027084407_published_appservice.go index 410fb7cf6..a2aeb7a6d 100644 --- a/roomserver/storage/sqlite3/deltas/20221027084407_published_appservice.go +++ b/roomserver/storage/sqlite3/deltas/20221027084407_published_appservice.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha.go b/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha.go index 515bccc37..2673d2433 100644 --- a/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha.go +++ b/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/roomserver/storage/sqlite3/event_json_table.go b/roomserver/storage/sqlite3/event_json_table.go index 325951c7f..510567152 100644 --- a/roomserver/storage/sqlite3/event_json_table.go +++ b/roomserver/storage/sqlite3/event_json_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/event_state_keys_table.go b/roomserver/storage/sqlite3/event_state_keys_table.go index a052d69ed..83485d1f4 100644 --- a/roomserver/storage/sqlite3/event_state_keys_table.go +++ b/roomserver/storage/sqlite3/event_state_keys_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/event_types_table.go b/roomserver/storage/sqlite3/event_types_table.go index c030fffea..15d151148 100644 --- a/roomserver/storage/sqlite3/event_types_table.go +++ b/roomserver/storage/sqlite3/event_types_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/events_table.go b/roomserver/storage/sqlite3/events_table.go index 26401e45d..ad30e277e 100644 --- a/roomserver/storage/sqlite3/events_table.go +++ b/roomserver/storage/sqlite3/events_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/invite_table.go b/roomserver/storage/sqlite3/invite_table.go index b678d8add..73105ddaf 100644 --- a/roomserver/storage/sqlite3/invite_table.go +++ b/roomserver/storage/sqlite3/invite_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/membership_table.go b/roomserver/storage/sqlite3/membership_table.go index 1012c074a..fecbd2b96 100644 --- a/roomserver/storage/sqlite3/membership_table.go +++ b/roomserver/storage/sqlite3/membership_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/previous_events_table.go b/roomserver/storage/sqlite3/previous_events_table.go index 4e59fbba7..1bb7fbd03 100644 --- a/roomserver/storage/sqlite3/previous_events_table.go +++ b/roomserver/storage/sqlite3/previous_events_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/published_table.go b/roomserver/storage/sqlite3/published_table.go index 34666552e..7d712f307 100644 --- a/roomserver/storage/sqlite3/published_table.go +++ b/roomserver/storage/sqlite3/published_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/purge_statements.go b/roomserver/storage/sqlite3/purge_statements.go index cb21515b8..f0967a446 100644 --- a/roomserver/storage/sqlite3/purge_statements.go +++ b/roomserver/storage/sqlite3/purge_statements.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/redactions_table.go b/roomserver/storage/sqlite3/redactions_table.go index db6f57a1b..faf586c36 100644 --- a/roomserver/storage/sqlite3/redactions_table.go +++ b/roomserver/storage/sqlite3/redactions_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/reported_events_table.go b/roomserver/storage/sqlite3/reported_events_table.go index b72cb0685..70029d57b 100644 --- a/roomserver/storage/sqlite3/reported_events_table.go +++ b/roomserver/storage/sqlite3/reported_events_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/room_aliases_table.go b/roomserver/storage/sqlite3/room_aliases_table.go index 815b42a27..7f6ea6eda 100644 --- a/roomserver/storage/sqlite3/room_aliases_table.go +++ b/roomserver/storage/sqlite3/room_aliases_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/rooms_table.go b/roomserver/storage/sqlite3/rooms_table.go index 5034b2425..cd1af3b88 100644 --- a/roomserver/storage/sqlite3/rooms_table.go +++ b/roomserver/storage/sqlite3/rooms_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/state_block_table.go b/roomserver/storage/sqlite3/state_block_table.go index ae8181cfa..f9f09f646 100644 --- a/roomserver/storage/sqlite3/state_block_table.go +++ b/roomserver/storage/sqlite3/state_block_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/state_snapshot_table.go b/roomserver/storage/sqlite3/state_snapshot_table.go index dcac0b07c..4eba014a6 100644 --- a/roomserver/storage/sqlite3/state_snapshot_table.go +++ b/roomserver/storage/sqlite3/state_snapshot_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/storage.go b/roomserver/storage/sqlite3/storage.go index 191c07223..7b117caa5 100644 --- a/roomserver/storage/sqlite3/storage.go +++ b/roomserver/storage/sqlite3/storage.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/user_room_keys_table.go b/roomserver/storage/sqlite3/user_room_keys_table.go index ef3b8fe20..c9189b7a2 100644 --- a/roomserver/storage/sqlite3/user_room_keys_table.go +++ b/roomserver/storage/sqlite3/user_room_keys_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/storage.go b/roomserver/storage/storage.go index c3689f513..ac7be9afa 100644 --- a/roomserver/storage/storage.go +++ b/roomserver/storage/storage.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !wasm // +build !wasm diff --git a/roomserver/storage/storage_wasm.go b/roomserver/storage/storage_wasm.go index 817f9304c..78b18040a 100644 --- a/roomserver/storage/storage_wasm.go +++ b/roomserver/storage/storage_wasm.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package storage diff --git a/roomserver/types/headered_event.go b/roomserver/types/headered_event.go index 783999822..dd1694b01 100644 --- a/roomserver/types/headered_event.go +++ b/roomserver/types/headered_event.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package types diff --git a/roomserver/types/types.go b/roomserver/types/types.go index fbff2cdab..39340c5ba 100644 --- a/roomserver/types/types.go +++ b/roomserver/types/types.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // Package types provides the types that are used internally within the roomserver. package types diff --git a/roomserver/version/version.go b/roomserver/version/version.go index e8bd890a0..0518f5807 100644 --- a/roomserver/version/version.go +++ b/roomserver/version/version.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package version diff --git a/setup/base/base.go b/setup/base/base.go index 26615fc08..2c6704bd3 100644 --- a/setup/base/base.go +++ b/setup/base/base.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package base diff --git a/setup/config/config.go b/setup/config/config.go index 41396ae36..cd785f4b5 100644 --- a/setup/config/config.go +++ b/setup/config/config.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package config diff --git a/setup/config/config_appservice.go b/setup/config/config_appservice.go index a95cec046..29d43ac78 100644 --- a/setup/config/config_appservice.go +++ b/setup/config/config_appservice.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Andrew Morgan // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package config diff --git a/setup/config/config_relayapi.go b/setup/config/config_relayapi.go index ba7b78082..00fa9b82e 100644 --- a/setup/config/config_relayapi.go +++ b/setup/config/config_relayapi.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package config diff --git a/setup/config/config_test.go b/setup/config/config_test.go index eeefb425f..b87b1c489 100644 --- a/setup/config/config_test.go +++ b/setup/config/config_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package config diff --git a/setup/flags.go b/setup/flags.go index 869caa280..724b4b004 100644 --- a/setup/flags.go +++ b/setup/flags.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package setup diff --git a/setup/monolith.go b/setup/monolith.go index 72750354b..c73b02951 100644 --- a/setup/monolith.go +++ b/setup/monolith.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package setup diff --git a/setup/mscs/msc2836/msc2836.go b/setup/mscs/msc2836/msc2836.go index 15811710d..05a129d10 100644 --- a/setup/mscs/msc2836/msc2836.go +++ b/setup/mscs/msc2836/msc2836.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // Package msc2836 'Threading' implements https://github.com/matrix-org/matrix-doc/pull/2836 package msc2836 diff --git a/setup/mscs/mscs.go b/setup/mscs/mscs.go index 7a942cf7c..777be49c6 100644 --- a/setup/mscs/mscs.go +++ b/setup/mscs/mscs.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. // Package mscs implements Matrix Spec Changes from https://github.com/matrix-org/matrix-doc package mscs diff --git a/syncapi/consumers/clientapi.go b/syncapi/consumers/clientapi.go index 76b447133..8eaa9d263 100644 --- a/syncapi/consumers/clientapi.go +++ b/syncapi/consumers/clientapi.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/syncapi/consumers/keychange.go b/syncapi/consumers/keychange.go index 5faaefb8e..83ba4f4f8 100644 --- a/syncapi/consumers/keychange.go +++ b/syncapi/consumers/keychange.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/syncapi/consumers/presence.go b/syncapi/consumers/presence.go index c7c0866ba..8615dbabb 100644 --- a/syncapi/consumers/presence.go +++ b/syncapi/consumers/presence.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/syncapi/consumers/receipts.go b/syncapi/consumers/receipts.go index 69571f90c..709d9bebf 100644 --- a/syncapi/consumers/receipts.go +++ b/syncapi/consumers/receipts.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go index abf888829..81cdc1ab2 100644 --- a/syncapi/consumers/roomserver.go +++ b/syncapi/consumers/roomserver.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/syncapi/consumers/sendtodevice.go b/syncapi/consumers/sendtodevice.go index 7f387dc09..0a56562f7 100644 --- a/syncapi/consumers/sendtodevice.go +++ b/syncapi/consumers/sendtodevice.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/syncapi/consumers/typing.go b/syncapi/consumers/typing.go index 67a26239d..91056f1c4 100644 --- a/syncapi/consumers/typing.go +++ b/syncapi/consumers/typing.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2019 Alex Chen // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/syncapi/consumers/userapi.go b/syncapi/consumers/userapi.go index 3c73dc1fc..a856dc6bf 100644 --- a/syncapi/consumers/userapi.go +++ b/syncapi/consumers/userapi.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/syncapi/internal/history_visibility.go b/syncapi/internal/history_visibility.go index 48475327d..abf9cf36b 100644 --- a/syncapi/internal/history_visibility.go +++ b/syncapi/internal/history_visibility.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/syncapi/internal/keychange.go b/syncapi/internal/keychange.go index 24ffcc041..4ad6dd6c4 100644 --- a/syncapi/internal/keychange.go +++ b/syncapi/internal/keychange.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/syncapi/notifier/notifier.go b/syncapi/notifier/notifier.go index 07b80b165..f57b781e4 100644 --- a/syncapi/notifier/notifier.go +++ b/syncapi/notifier/notifier.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package notifier diff --git a/syncapi/notifier/notifier_test.go b/syncapi/notifier/notifier_test.go index f86301a06..c5c47be57 100644 --- a/syncapi/notifier/notifier_test.go +++ b/syncapi/notifier/notifier_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package notifier diff --git a/syncapi/notifier/userstream.go b/syncapi/notifier/userstream.go index bcd69fad5..2daf64238 100644 --- a/syncapi/notifier/userstream.go +++ b/syncapi/notifier/userstream.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package notifier diff --git a/syncapi/producers/appservices.go b/syncapi/producers/appservices.go index bb0dbb9cf..411473d3a 100644 --- a/syncapi/producers/appservices.go +++ b/syncapi/producers/appservices.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package producers diff --git a/syncapi/producers/federationapi_presence.go b/syncapi/producers/federationapi_presence.go index eab1b0b25..5b4811754 100644 --- a/syncapi/producers/federationapi_presence.go +++ b/syncapi/producers/federationapi_presence.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package producers diff --git a/syncapi/routing/context.go b/syncapi/routing/context.go index b136c69a0..025982ff2 100644 --- a/syncapi/routing/context.go +++ b/syncapi/routing/context.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/syncapi/routing/filter.go b/syncapi/routing/filter.go index c4eecbdb8..24ab9eba1 100644 --- a/syncapi/routing/filter.go +++ b/syncapi/routing/filter.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Jan Christian Grünhage // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/syncapi/routing/getevent.go b/syncapi/routing/getevent.go index d0227f4ea..878853d8d 100644 --- a/syncapi/routing/getevent.go +++ b/syncapi/routing/getevent.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/syncapi/routing/memberships.go b/syncapi/routing/memberships.go index 9cc937d88..6e97bcfea 100644 --- a/syncapi/routing/memberships.go +++ b/syncapi/routing/memberships.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/syncapi/routing/messages.go b/syncapi/routing/messages.go index 7ea01c7dc..8a75d4619 100644 --- a/syncapi/routing/messages.go +++ b/syncapi/routing/messages.go @@ -1,16 +1,7 @@ -// Copyright 2018 New Vector Ltd +// Copyright 2018-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/syncapi/routing/relations.go b/syncapi/routing/relations.go index 935ba83b3..1ceb40cfa 100644 --- a/syncapi/routing/relations.go +++ b/syncapi/routing/relations.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/syncapi/routing/routing.go b/syncapi/routing/routing.go index 78188d1b6..207a7ecd0 100644 --- a/syncapi/routing/routing.go +++ b/syncapi/routing/routing.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/syncapi/routing/search.go b/syncapi/routing/search.go index 4a8be9f49..df5ee4e96 100644 --- a/syncapi/routing/search.go +++ b/syncapi/routing/search.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package routing diff --git a/syncapi/storage/interface.go b/syncapi/storage/interface.go index 97c781b9b..88d69d560 100644 --- a/syncapi/storage/interface.go +++ b/syncapi/storage/interface.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package storage diff --git a/syncapi/storage/postgres/account_data_table.go b/syncapi/storage/postgres/account_data_table.go index 44d735bb4..eab1e2d51 100644 --- a/syncapi/storage/postgres/account_data_table.go +++ b/syncapi/storage/postgres/account_data_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/backwards_extremities_table.go b/syncapi/storage/postgres/backwards_extremities_table.go index c20d860a7..a205c561f 100644 --- a/syncapi/storage/postgres/backwards_extremities_table.go +++ b/syncapi/storage/postgres/backwards_extremities_table.go @@ -1,16 +1,7 @@ -// Copyright 2018 New Vector Ltd +// Copyright 2018-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/current_room_state_table.go b/syncapi/storage/postgres/current_room_state_table.go index ec0b27adc..7af67f3a3 100644 --- a/syncapi/storage/postgres/current_room_state_table.go +++ b/syncapi/storage/postgres/current_room_state_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/deltas/20201211125500_sequences.go b/syncapi/storage/postgres/deltas/20201211125500_sequences.go index 6303c9472..acbd84a2d 100644 --- a/syncapi/storage/postgres/deltas/20201211125500_sequences.go +++ b/syncapi/storage/postgres/deltas/20201211125500_sequences.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/syncapi/storage/postgres/deltas/20210112130000_sendtodevice_sentcolumn.go b/syncapi/storage/postgres/deltas/20210112130000_sendtodevice_sentcolumn.go index 77b083ae2..444d1d1f7 100644 --- a/syncapi/storage/postgres/deltas/20210112130000_sendtodevice_sentcolumn.go +++ b/syncapi/storage/postgres/deltas/20210112130000_sendtodevice_sentcolumn.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/syncapi/storage/postgres/deltas/2022061412000000_history_visibility_column.go b/syncapi/storage/postgres/deltas/2022061412000000_history_visibility_column.go index 37660ee9d..4ac179d0a 100644 --- a/syncapi/storage/postgres/deltas/2022061412000000_history_visibility_column.go +++ b/syncapi/storage/postgres/deltas/2022061412000000_history_visibility_column.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/syncapi/storage/postgres/deltas/20230201152200_rename_index.go b/syncapi/storage/postgres/deltas/20230201152200_rename_index.go index 5a0ec5050..6e0bf81a4 100644 --- a/syncapi/storage/postgres/deltas/20230201152200_rename_index.go +++ b/syncapi/storage/postgres/deltas/20230201152200_rename_index.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/syncapi/storage/postgres/filter_table.go b/syncapi/storage/postgres/filter_table.go index 089382b89..42dbc544c 100644 --- a/syncapi/storage/postgres/filter_table.go +++ b/syncapi/storage/postgres/filter_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Jan Christian Grünhage // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/filtering.go b/syncapi/storage/postgres/filtering.go index 39ef11086..4fbc99156 100644 --- a/syncapi/storage/postgres/filtering.go +++ b/syncapi/storage/postgres/filtering.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Thibaut CHARLES // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/ignores_table.go b/syncapi/storage/postgres/ignores_table.go index a511c747c..b981aaad0 100644 --- a/syncapi/storage/postgres/ignores_table.go +++ b/syncapi/storage/postgres/ignores_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/invites_table.go b/syncapi/storage/postgres/invites_table.go index 1f46cd09d..3e4ee43b5 100644 --- a/syncapi/storage/postgres/invites_table.go +++ b/syncapi/storage/postgres/invites_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/memberships_table.go b/syncapi/storage/postgres/memberships_table.go index e5208b891..94c319ea4 100644 --- a/syncapi/storage/postgres/memberships_table.go +++ b/syncapi/storage/postgres/memberships_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/notification_data_table.go b/syncapi/storage/postgres/notification_data_table.go index 7edfd54a6..b98cb4269 100644 --- a/syncapi/storage/postgres/notification_data_table.go +++ b/syncapi/storage/postgres/notification_data_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/output_room_events_table.go b/syncapi/storage/postgres/output_room_events_table.go index b2d191111..4c07c028f 100644 --- a/syncapi/storage/postgres/output_room_events_table.go +++ b/syncapi/storage/postgres/output_room_events_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/output_room_events_topology_table.go b/syncapi/storage/postgres/output_room_events_topology_table.go index 2158d99ec..64c085ba5 100644 --- a/syncapi/storage/postgres/output_room_events_topology_table.go +++ b/syncapi/storage/postgres/output_room_events_topology_table.go @@ -1,16 +1,7 @@ -// Copyright 2018 New Vector Ltd +// Copyright 2018-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/peeks_table.go b/syncapi/storage/postgres/peeks_table.go index 1120dce0b..462f48eae 100644 --- a/syncapi/storage/postgres/peeks_table.go +++ b/syncapi/storage/postgres/peeks_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/presence_table.go b/syncapi/storage/postgres/presence_table.go index 53acecce5..1daed8f9d 100644 --- a/syncapi/storage/postgres/presence_table.go +++ b/syncapi/storage/postgres/presence_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/receipt_table.go b/syncapi/storage/postgres/receipt_table.go index 9ab8eece0..a1ae0d3d4 100644 --- a/syncapi/storage/postgres/receipt_table.go +++ b/syncapi/storage/postgres/receipt_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/relations_table.go b/syncapi/storage/postgres/relations_table.go index 5a76e9c33..406b5f647 100644 --- a/syncapi/storage/postgres/relations_table.go +++ b/syncapi/storage/postgres/relations_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/send_to_device_table.go b/syncapi/storage/postgres/send_to_device_table.go index 88b86ef7b..4cd5039e8 100644 --- a/syncapi/storage/postgres/send_to_device_table.go +++ b/syncapi/storage/postgres/send_to_device_table.go @@ -1,16 +1,8 @@ -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/syncserver.go b/syncapi/storage/postgres/syncserver.go index 2105bcae2..5596986c1 100644 --- a/syncapi/storage/postgres/syncserver.go +++ b/syncapi/storage/postgres/syncserver.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/syncapi/storage/shared/storage_consumer.go b/syncapi/storage/shared/storage_consumer.go index 923ead9bd..86998b66a 100644 --- a/syncapi/storage/shared/storage_consumer.go +++ b/syncapi/storage/shared/storage_consumer.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package shared diff --git a/syncapi/storage/sqlite3/account_data_table.go b/syncapi/storage/sqlite3/account_data_table.go index 132bd80c8..a5231f00c 100644 --- a/syncapi/storage/sqlite3/account_data_table.go +++ b/syncapi/storage/sqlite3/account_data_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/backwards_extremities_table.go b/syncapi/storage/sqlite3/backwards_extremities_table.go index 2d8cf2ed2..d97e6c478 100644 --- a/syncapi/storage/sqlite3/backwards_extremities_table.go +++ b/syncapi/storage/sqlite3/backwards_extremities_table.go @@ -1,16 +1,7 @@ -// Copyright 2018 New Vector Ltd +// Copyright 2018-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/current_room_state_table.go b/syncapi/storage/sqlite3/current_room_state_table.go index f430fcc05..b0872ee66 100644 --- a/syncapi/storage/sqlite3/current_room_state_table.go +++ b/syncapi/storage/sqlite3/current_room_state_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/deltas/20201211125500_sequences.go b/syncapi/storage/sqlite3/deltas/20201211125500_sequences.go index f476335d5..f34fdf654 100644 --- a/syncapi/storage/sqlite3/deltas/20201211125500_sequences.go +++ b/syncapi/storage/sqlite3/deltas/20201211125500_sequences.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/syncapi/storage/sqlite3/deltas/20210112130000_sendtodevice_sentcolumn.go b/syncapi/storage/sqlite3/deltas/20210112130000_sendtodevice_sentcolumn.go index 34cae2241..4a24d4d30 100644 --- a/syncapi/storage/sqlite3/deltas/20210112130000_sendtodevice_sentcolumn.go +++ b/syncapi/storage/sqlite3/deltas/20210112130000_sendtodevice_sentcolumn.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/syncapi/storage/sqlite3/deltas/2022061412000000_history_visibility_column.go b/syncapi/storage/sqlite3/deltas/2022061412000000_history_visibility_column.go index f7ce6531e..4f1f7123e 100644 --- a/syncapi/storage/sqlite3/deltas/2022061412000000_history_visibility_column.go +++ b/syncapi/storage/sqlite3/deltas/2022061412000000_history_visibility_column.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/syncapi/storage/sqlite3/filter_table.go b/syncapi/storage/sqlite3/filter_table.go index 8da4f299c..56aef4bbc 100644 --- a/syncapi/storage/sqlite3/filter_table.go +++ b/syncapi/storage/sqlite3/filter_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Jan Christian Grünhage // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/ignores_table.go b/syncapi/storage/sqlite3/ignores_table.go index bff5780b0..08376f255 100644 --- a/syncapi/storage/sqlite3/ignores_table.go +++ b/syncapi/storage/sqlite3/ignores_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/invites_table.go b/syncapi/storage/sqlite3/invites_table.go index e50b5cbf8..57ae38840 100644 --- a/syncapi/storage/sqlite3/invites_table.go +++ b/syncapi/storage/sqlite3/invites_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/memberships_table.go b/syncapi/storage/sqlite3/memberships_table.go index 9e50422e5..50b55801b 100644 --- a/syncapi/storage/sqlite3/memberships_table.go +++ b/syncapi/storage/sqlite3/memberships_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/notification_data_table.go b/syncapi/storage/sqlite3/notification_data_table.go index af2b2c074..02068f8dd 100644 --- a/syncapi/storage/sqlite3/notification_data_table.go +++ b/syncapi/storage/sqlite3/notification_data_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/output_room_events_table.go b/syncapi/storage/sqlite3/output_room_events_table.go index c7b11d3ef..4872951f2 100644 --- a/syncapi/storage/sqlite3/output_room_events_table.go +++ b/syncapi/storage/sqlite3/output_room_events_table.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/output_room_events_topology_table.go b/syncapi/storage/sqlite3/output_room_events_topology_table.go index c00fb7a79..439961f16 100644 --- a/syncapi/storage/sqlite3/output_room_events_topology_table.go +++ b/syncapi/storage/sqlite3/output_room_events_topology_table.go @@ -1,16 +1,7 @@ -// Copyright 2018 New Vector Ltd +// Copyright 2018-2024 New Vector Ltd. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/peeks_table.go b/syncapi/storage/sqlite3/peeks_table.go index d8998e2b8..61557f404 100644 --- a/syncapi/storage/sqlite3/peeks_table.go +++ b/syncapi/storage/sqlite3/peeks_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/presence_table.go b/syncapi/storage/sqlite3/presence_table.go index 40b57e75d..e1f6be449 100644 --- a/syncapi/storage/sqlite3/presence_table.go +++ b/syncapi/storage/sqlite3/presence_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/receipt_table.go b/syncapi/storage/sqlite3/receipt_table.go index b973903bd..61e203e4c 100644 --- a/syncapi/storage/sqlite3/receipt_table.go +++ b/syncapi/storage/sqlite3/receipt_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/relations_table.go b/syncapi/storage/sqlite3/relations_table.go index 7cbb5408f..8ba69223c 100644 --- a/syncapi/storage/sqlite3/relations_table.go +++ b/syncapi/storage/sqlite3/relations_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/send_to_device_table.go b/syncapi/storage/sqlite3/send_to_device_table.go index 998a063cd..5f3d96ab2 100644 --- a/syncapi/storage/sqlite3/send_to_device_table.go +++ b/syncapi/storage/sqlite3/send_to_device_table.go @@ -1,16 +1,8 @@ -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/syncserver.go b/syncapi/storage/sqlite3/syncserver.go index e1372f10b..c52c72228 100644 --- a/syncapi/storage/sqlite3/syncserver.go +++ b/syncapi/storage/sqlite3/syncserver.go @@ -1,17 +1,9 @@ -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/storage.go b/syncapi/storage/storage.go index e05f9d911..719659a3d 100644 --- a/syncapi/storage/storage.go +++ b/syncapi/storage/storage.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !wasm // +build !wasm diff --git a/syncapi/storage/storage_wasm.go b/syncapi/storage/storage_wasm.go index db0b173bb..cc1246cc3 100644 --- a/syncapi/storage/storage_wasm.go +++ b/syncapi/storage/storage_wasm.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package storage diff --git a/syncapi/storage/tables/interface.go b/syncapi/storage/tables/interface.go index 45117d6d3..65db49115 100644 --- a/syncapi/storage/tables/interface.go +++ b/syncapi/storage/tables/interface.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package tables diff --git a/syncapi/streams/stream_presence.go b/syncapi/streams/stream_presence.go index 324240667..be228b8e1 100644 --- a/syncapi/streams/stream_presence.go +++ b/syncapi/streams/stream_presence.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package streams diff --git a/syncapi/sync/request.go b/syncapi/sync/request.go index 617342331..76ac216ba 100644 --- a/syncapi/sync/request.go +++ b/syncapi/sync/request.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sync diff --git a/syncapi/sync/requestpool.go b/syncapi/sync/requestpool.go index 494be05f7..3c09966c9 100644 --- a/syncapi/sync/requestpool.go +++ b/syncapi/sync/requestpool.go @@ -1,18 +1,10 @@ +// Copyright 2024 New Vector Ltd. +// Copyright 2019, 2020 The Matrix.org Foundation C.I.C. +// Copyright 2017, 2018 New Vector Ltd // Copyright 2017 Vector Creations Ltd -// Copyright 2017-2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sync diff --git a/syncapi/syncapi.go b/syncapi/syncapi.go index 0418ffc05..465f60bf2 100644 --- a/syncapi/syncapi.go +++ b/syncapi/syncapi.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package syncapi diff --git a/syncapi/synctypes/clientevent.go b/syncapi/synctypes/clientevent.go index fe4f6c07f..0c297688d 100644 --- a/syncapi/synctypes/clientevent.go +++ b/syncapi/synctypes/clientevent.go @@ -1,16 +1,8 @@ -/* Copyright 2017 Vector Creations Ltd +/* Copyright 2024 New Vector Ltd. + * Copyright 2017 Vector Creations Ltd * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * SPDX-License-Identifier: AGPL-3.0-only + * Please see LICENSE in the repository root for full details. */ package synctypes diff --git a/syncapi/synctypes/clientevent_test.go b/syncapi/synctypes/clientevent_test.go index 662f9ea43..68bbaff12 100644 --- a/syncapi/synctypes/clientevent_test.go +++ b/syncapi/synctypes/clientevent_test.go @@ -1,16 +1,8 @@ -/* Copyright 2017 Vector Creations Ltd +/* Copyright 2024 New Vector Ltd. + * Copyright 2017 Vector Creations Ltd * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * SPDX-License-Identifier: AGPL-3.0-only + * Please see LICENSE in the repository root for full details. */ package synctypes diff --git a/syncapi/synctypes/filter.go b/syncapi/synctypes/filter.go index 8998d4433..1b3e10483 100644 --- a/syncapi/synctypes/filter.go +++ b/syncapi/synctypes/filter.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Jan Christian Grünhage // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package synctypes diff --git a/syncapi/types/presence.go b/syncapi/types/presence.go index a9c5e3a42..1bb8abeaf 100644 --- a/syncapi/types/presence.go +++ b/syncapi/types/presence.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package types diff --git a/syncapi/types/types.go b/syncapi/types/types.go index 26faf7c05..6c6e99a40 100644 --- a/syncapi/types/types.go +++ b/syncapi/types/types.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package types diff --git a/test/db.go b/test/db.go index d2f405d49..20ecddc3a 100644 --- a/test/db.go +++ b/test/db.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package test diff --git a/test/event.go b/test/event.go index 197f80e13..04c2d1a57 100644 --- a/test/event.go +++ b/test/event.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package test diff --git a/test/keyring.go b/test/keyring.go index ed9c34849..6782eab50 100644 --- a/test/keyring.go +++ b/test/keyring.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package test diff --git a/test/keys.go b/test/keys.go index 05f7317cf..429d2e49c 100644 --- a/test/keys.go +++ b/test/keys.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package test diff --git a/test/memory_federation_db.go b/test/memory_federation_db.go index 76034143f..a4042f7b3 100644 --- a/test/memory_federation_db.go +++ b/test/memory_federation_db.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package test diff --git a/test/memory_relay_db.go b/test/memory_relay_db.go index eecc23fe7..16e93b565 100644 --- a/test/memory_relay_db.go +++ b/test/memory_relay_db.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package test diff --git a/test/room.go b/test/room.go index da09de7c2..988adc88f 100644 --- a/test/room.go +++ b/test/room.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package test diff --git a/test/slice.go b/test/slice.go index 00c740db7..8a0917d92 100644 --- a/test/slice.go +++ b/test/slice.go @@ -8,7 +8,10 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2024 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package test diff --git a/test/testrig/base.go b/test/testrig/base.go index a21cfe802..28bbd0840 100644 --- a/test/testrig/base.go +++ b/test/testrig/base.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package testrig diff --git a/test/user.go b/test/user.go index 9509b95a6..273d90437 100644 --- a/test/user.go +++ b/test/user.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package test diff --git a/userapi/api/api.go b/userapi/api/api.go index d4daec820..42f0c8c9d 100644 --- a/userapi/api/api.go +++ b/userapi/api/api.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package api diff --git a/userapi/api/api_logintoken.go b/userapi/api/api_logintoken.go index e2207bb53..a4200bdbd 100644 --- a/userapi/api/api_logintoken.go +++ b/userapi/api/api_logintoken.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package api diff --git a/userapi/consumers/clientapi.go b/userapi/consumers/clientapi.go index ba72ff350..ebb567bcc 100644 --- a/userapi/consumers/clientapi.go +++ b/userapi/consumers/clientapi.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/userapi/consumers/devicelistupdate.go b/userapi/consumers/devicelistupdate.go index b3ccb573b..dd22a937d 100644 --- a/userapi/consumers/devicelistupdate.go +++ b/userapi/consumers/devicelistupdate.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/userapi/consumers/signingkeyupdate.go b/userapi/consumers/signingkeyupdate.go index 9de866343..781089ce1 100644 --- a/userapi/consumers/signingkeyupdate.go +++ b/userapi/consumers/signingkeyupdate.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package consumers diff --git a/userapi/internal/api_logintoken.go b/userapi/internal/api_logintoken.go index 3b211db5b..c141b7bf4 100644 --- a/userapi/internal/api_logintoken.go +++ b/userapi/internal/api_logintoken.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/userapi/internal/cross_signing.go b/userapi/internal/cross_signing.go index be05841c4..6e0a7110b 100644 --- a/userapi/internal/cross_signing.go +++ b/userapi/internal/cross_signing.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/userapi/internal/device_list_update.go b/userapi/internal/device_list_update.go index b40635160..9b4cf6a74 100644 --- a/userapi/internal/device_list_update.go +++ b/userapi/internal/device_list_update.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/userapi/internal/device_list_update_default.go b/userapi/internal/device_list_update_default.go index 7d357c951..ae2c25392 100644 --- a/userapi/internal/device_list_update_default.go +++ b/userapi/internal/device_list_update_default.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !vw diff --git a/userapi/internal/device_list_update_sytest.go b/userapi/internal/device_list_update_sytest.go index 1c60d2eb9..177bd961c 100644 --- a/userapi/internal/device_list_update_sytest.go +++ b/userapi/internal/device_list_update_sytest.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build vw diff --git a/userapi/internal/device_list_update_test.go b/userapi/internal/device_list_update_test.go index a2f1869d1..8affd47c5 100644 --- a/userapi/internal/device_list_update_test.go +++ b/userapi/internal/device_list_update_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/userapi/internal/key_api.go b/userapi/internal/key_api.go index 81127481e..10e06b5f2 100644 --- a/userapi/internal/key_api.go +++ b/userapi/internal/key_api.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/userapi/internal/user_api.go b/userapi/internal/user_api.go index fd73bf62f..73ca3783e 100644 --- a/userapi/internal/user_api.go +++ b/userapi/internal/user_api.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package internal diff --git a/userapi/producers/keychange.go b/userapi/producers/keychange.go index da6cea31a..79b7cf80e 100644 --- a/userapi/producers/keychange.go +++ b/userapi/producers/keychange.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package producers diff --git a/userapi/storage/interface.go b/userapi/storage/interface.go index 125b31585..b0796fbac 100644 --- a/userapi/storage/interface.go +++ b/userapi/storage/interface.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package storage diff --git a/userapi/storage/postgres/account_data_table.go b/userapi/storage/postgres/account_data_table.go index 6ffda340e..f4e624f9c 100644 --- a/userapi/storage/postgres/account_data_table.go +++ b/userapi/storage/postgres/account_data_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/accounts_table.go b/userapi/storage/postgres/accounts_table.go index 5b38c5f4b..fc81edd11 100644 --- a/userapi/storage/postgres/accounts_table.go +++ b/userapi/storage/postgres/accounts_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/cross_signing_keys_table.go b/userapi/storage/postgres/cross_signing_keys_table.go index deb355718..6a09bdcf2 100644 --- a/userapi/storage/postgres/cross_signing_keys_table.go +++ b/userapi/storage/postgres/cross_signing_keys_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/cross_signing_sigs_table.go b/userapi/storage/postgres/cross_signing_sigs_table.go index cba015e13..0b9bf8e24 100644 --- a/userapi/storage/postgres/cross_signing_sigs_table.go +++ b/userapi/storage/postgres/cross_signing_sigs_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/deltas/2022012016470000_key_changes.go b/userapi/storage/postgres/deltas/2022012016470000_key_changes.go index 0cfe9e791..8bb726a50 100644 --- a/userapi/storage/postgres/deltas/2022012016470000_key_changes.go +++ b/userapi/storage/postgres/deltas/2022012016470000_key_changes.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/userapi/storage/postgres/deltas/2022042612000000_xsigning_idx.go b/userapi/storage/postgres/deltas/2022042612000000_xsigning_idx.go index 1a3d4fee9..fee0d8c9a 100644 --- a/userapi/storage/postgres/deltas/2022042612000000_xsigning_idx.go +++ b/userapi/storage/postgres/deltas/2022042612000000_xsigning_idx.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/userapi/storage/postgres/device_keys_table.go b/userapi/storage/postgres/device_keys_table.go index a9203857f..b6950ce97 100644 --- a/userapi/storage/postgres/device_keys_table.go +++ b/userapi/storage/postgres/device_keys_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/devices_table.go b/userapi/storage/postgres/devices_table.go index 0335f8266..6e88546a6 100644 --- a/userapi/storage/postgres/devices_table.go +++ b/userapi/storage/postgres/devices_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/key_backup_table.go b/userapi/storage/postgres/key_backup_table.go index 59944a125..3cbc86cc2 100644 --- a/userapi/storage/postgres/key_backup_table.go +++ b/userapi/storage/postgres/key_backup_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/key_backup_version_table.go b/userapi/storage/postgres/key_backup_version_table.go index 67c5e5481..90ff98614 100644 --- a/userapi/storage/postgres/key_backup_version_table.go +++ b/userapi/storage/postgres/key_backup_version_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/key_changes_table.go b/userapi/storage/postgres/key_changes_table.go index de3a9e9c8..1fbc39660 100644 --- a/userapi/storage/postgres/key_changes_table.go +++ b/userapi/storage/postgres/key_changes_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/logintoken_table.go b/userapi/storage/postgres/logintoken_table.go index 44c6ca4ae..cacfcb37d 100644 --- a/userapi/storage/postgres/logintoken_table.go +++ b/userapi/storage/postgres/logintoken_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/notifications_table.go b/userapi/storage/postgres/notifications_table.go index acb9e42bc..a7c1a6421 100644 --- a/userapi/storage/postgres/notifications_table.go +++ b/userapi/storage/postgres/notifications_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 Dan Peleg // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/one_time_keys_table.go b/userapi/storage/postgres/one_time_keys_table.go index a00f4d6f6..bfd91c54c 100644 --- a/userapi/storage/postgres/one_time_keys_table.go +++ b/userapi/storage/postgres/one_time_keys_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/profile_table.go b/userapi/storage/postgres/profile_table.go index e4f55ed94..8a7163fbf 100644 --- a/userapi/storage/postgres/profile_table.go +++ b/userapi/storage/postgres/profile_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/pusher_table.go b/userapi/storage/postgres/pusher_table.go index 2e88aa8e9..64ab56798 100644 --- a/userapi/storage/postgres/pusher_table.go +++ b/userapi/storage/postgres/pusher_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 Dan Peleg // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/stale_device_lists.go b/userapi/storage/postgres/stale_device_lists.go index e2086dc99..f27a3b3c1 100644 --- a/userapi/storage/postgres/stale_device_lists.go +++ b/userapi/storage/postgres/stale_device_lists.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/stats_table.go b/userapi/storage/postgres/stats_table.go index a7949e4ba..99787c070 100644 --- a/userapi/storage/postgres/stats_table.go +++ b/userapi/storage/postgres/stats_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/storage.go b/userapi/storage/postgres/storage.go index b4edc80a9..2754329d1 100644 --- a/userapi/storage/postgres/storage.go +++ b/userapi/storage/postgres/storage.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/threepid_table.go b/userapi/storage/postgres/threepid_table.go index fc46061dc..eec7af881 100644 --- a/userapi/storage/postgres/threepid_table.go +++ b/userapi/storage/postgres/threepid_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package postgres diff --git a/userapi/storage/shared/storage.go b/userapi/storage/shared/storage.go index b7acb2035..f90ca8e4a 100644 --- a/userapi/storage/shared/storage.go +++ b/userapi/storage/shared/storage.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package shared diff --git a/userapi/storage/sqlite3/account_data_table.go b/userapi/storage/sqlite3/account_data_table.go index 240647b32..9100585f4 100644 --- a/userapi/storage/sqlite3/account_data_table.go +++ b/userapi/storage/sqlite3/account_data_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/accounts_table.go b/userapi/storage/sqlite3/accounts_table.go index d01915a76..51ee8d06b 100644 --- a/userapi/storage/sqlite3/accounts_table.go +++ b/userapi/storage/sqlite3/accounts_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/constraint_wasm.go b/userapi/storage/sqlite3/constraint_wasm.go index 6c4ee762f..1ec7c42d6 100644 --- a/userapi/storage/sqlite3/constraint_wasm.go +++ b/userapi/storage/sqlite3/constraint_wasm.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build wasm // +build wasm diff --git a/userapi/storage/sqlite3/cross_signing_keys_table.go b/userapi/storage/sqlite3/cross_signing_keys_table.go index 65b9ff1af..01b4bbe79 100644 --- a/userapi/storage/sqlite3/cross_signing_keys_table.go +++ b/userapi/storage/sqlite3/cross_signing_keys_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/cross_signing_sigs_table.go b/userapi/storage/sqlite3/cross_signing_sigs_table.go index bf400a00e..6246c67a8 100644 --- a/userapi/storage/sqlite3/cross_signing_sigs_table.go +++ b/userapi/storage/sqlite3/cross_signing_sigs_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/deltas/2022012016470000_key_changes.go b/userapi/storage/sqlite3/deltas/2022012016470000_key_changes.go index cd0f19df9..22872cad8 100644 --- a/userapi/storage/sqlite3/deltas/2022012016470000_key_changes.go +++ b/userapi/storage/sqlite3/deltas/2022012016470000_key_changes.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/userapi/storage/sqlite3/deltas/2022042612000000_xsigning_idx.go b/userapi/storage/sqlite3/deltas/2022042612000000_xsigning_idx.go index d4e38dea5..35113500e 100644 --- a/userapi/storage/sqlite3/deltas/2022042612000000_xsigning_idx.go +++ b/userapi/storage/sqlite3/deltas/2022042612000000_xsigning_idx.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package deltas diff --git a/userapi/storage/sqlite3/device_keys_table.go b/userapi/storage/sqlite3/device_keys_table.go index 15e69cc4c..f2114a115 100644 --- a/userapi/storage/sqlite3/device_keys_table.go +++ b/userapi/storage/sqlite3/device_keys_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/devices_table.go b/userapi/storage/sqlite3/devices_table.go index 5ce285c87..d0c6f8d8e 100644 --- a/userapi/storage/sqlite3/devices_table.go +++ b/userapi/storage/sqlite3/devices_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/key_backup_table.go b/userapi/storage/sqlite3/key_backup_table.go index 1cdaca180..4a2092a96 100644 --- a/userapi/storage/sqlite3/key_backup_table.go +++ b/userapi/storage/sqlite3/key_backup_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/key_backup_version_table.go b/userapi/storage/sqlite3/key_backup_version_table.go index 37bc13ed1..179dc1f9a 100644 --- a/userapi/storage/sqlite3/key_backup_version_table.go +++ b/userapi/storage/sqlite3/key_backup_version_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/key_changes_table.go b/userapi/storage/sqlite3/key_changes_table.go index 7a4898cfb..398235943 100644 --- a/userapi/storage/sqlite3/key_changes_table.go +++ b/userapi/storage/sqlite3/key_changes_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/logintoken_table.go b/userapi/storage/sqlite3/logintoken_table.go index 2abdcb95e..b0e8b5c90 100644 --- a/userapi/storage/sqlite3/logintoken_table.go +++ b/userapi/storage/sqlite3/logintoken_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/notifications_table.go b/userapi/storage/sqlite3/notifications_table.go index 94d6c7294..e2d44e52a 100644 --- a/userapi/storage/sqlite3/notifications_table.go +++ b/userapi/storage/sqlite3/notifications_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 Dan Peleg // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/one_time_keys_table.go b/userapi/storage/sqlite3/one_time_keys_table.go index 2a5b1280b..f160e778c 100644 --- a/userapi/storage/sqlite3/one_time_keys_table.go +++ b/userapi/storage/sqlite3/one_time_keys_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/profile_table.go b/userapi/storage/sqlite3/profile_table.go index 7285110bc..ea6649c07 100644 --- a/userapi/storage/sqlite3/profile_table.go +++ b/userapi/storage/sqlite3/profile_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/pusher_table.go b/userapi/storage/sqlite3/pusher_table.go index e09f9c78f..3c79d289a 100644 --- a/userapi/storage/sqlite3/pusher_table.go +++ b/userapi/storage/sqlite3/pusher_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 Dan Peleg // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/stale_device_lists.go b/userapi/storage/sqlite3/stale_device_lists.go index 5302899f4..3eb9f9cb7 100644 --- a/userapi/storage/sqlite3/stale_device_lists.go +++ b/userapi/storage/sqlite3/stale_device_lists.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/stats_table.go b/userapi/storage/sqlite3/stats_table.go index 71d80d4d4..deb73bd3d 100644 --- a/userapi/storage/sqlite3/stats_table.go +++ b/userapi/storage/sqlite3/stats_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/storage.go b/userapi/storage/sqlite3/storage.go index fc13dde57..604406709 100644 --- a/userapi/storage/sqlite3/storage.go +++ b/userapi/storage/sqlite3/storage.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/threepid_table.go b/userapi/storage/sqlite3/threepid_table.go index a83f80423..d6af17fa3 100644 --- a/userapi/storage/sqlite3/threepid_table.go +++ b/userapi/storage/sqlite3/threepid_table.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package sqlite3 diff --git a/userapi/storage/storage.go b/userapi/storage/storage.go index 701383fcb..c99b74769 100644 --- a/userapi/storage/storage.go +++ b/userapi/storage/storage.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !wasm // +build !wasm diff --git a/userapi/storage/storage_wasm.go b/userapi/storage/storage_wasm.go index cbadd98e9..d555054cb 100644 --- a/userapi/storage/storage_wasm.go +++ b/userapi/storage/storage_wasm.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package storage diff --git a/userapi/storage/tables/interface.go b/userapi/storage/tables/interface.go index 3a0be73e4..61a241785 100644 --- a/userapi/storage/tables/interface.go +++ b/userapi/storage/tables/interface.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package tables diff --git a/userapi/types/statistics.go b/userapi/types/statistics.go index b74e32add..99a00a31f 100644 --- a/userapi/types/statistics.go +++ b/userapi/types/statistics.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package types diff --git a/userapi/types/storage.go b/userapi/types/storage.go index 2c918847d..7bc592259 100644 --- a/userapi/types/storage.go +++ b/userapi/types/storage.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package types diff --git a/userapi/userapi.go b/userapi/userapi.go index a1c9b94a9..c25b5bbda 100644 --- a/userapi/userapi.go +++ b/userapi/userapi.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package userapi diff --git a/userapi/userapi_test.go b/userapi/userapi_test.go index 45762a7d8..495bd6aaf 100644 --- a/userapi/userapi_test.go +++ b/userapi/userapi_test.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package userapi_test diff --git a/userapi/util/phonehomestats.go b/userapi/util/phonehomestats.go index 4bf9a5d88..f04b93d3c 100644 --- a/userapi/util/phonehomestats.go +++ b/userapi/util/phonehomestats.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package util diff --git a/userapi/util/stats.go b/userapi/util/stats.go index 22ef12aad..c711c8979 100644 --- a/userapi/util/stats.go +++ b/userapi/util/stats.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !wasm && !windows // +build !wasm,!windows diff --git a/userapi/util/stats_wasm.go b/userapi/util/stats_wasm.go index a182e4e6e..0e3af9615 100644 --- a/userapi/util/stats_wasm.go +++ b/userapi/util/stats_wasm.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. package util diff --git a/userapi/util/stats_windows.go b/userapi/util/stats_windows.go index 0b3f8d013..2e9def2e4 100644 --- a/userapi/util/stats_windows.go +++ b/userapi/util/stats_windows.go @@ -1,16 +1,8 @@ +// Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: AGPL-3.0-only +// Please see LICENSE in the repository root for full details. //go:build !wasm // +build !wasm From 984b02434e3b3caed4283fc94a9c2dc610425449 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Thu, 17 Oct 2024 17:21:06 +0200 Subject: [PATCH 02/13] Update license file --- LICENSE | 836 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 660 insertions(+), 176 deletions(-) diff --git a/LICENSE b/LICENSE index f433b1a53..be3f7b28e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,177 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. From b85bc28eecfca0fd832475fc75a37a94081cc58c Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Thu, 17 Oct 2024 17:21:14 +0200 Subject: [PATCH 03/13] Update license in Docker image annotations --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bf8069213..a703529d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN apk --update --no-cache add curl LABEL org.opencontainers.image.title="Dendrite" LABEL org.opencontainers.image.description="Next-generation Matrix homeserver written in Go" LABEL org.opencontainers.image.source="https://github.com/matrix-org/dendrite" -LABEL org.opencontainers.image.licenses="Apache-2.0" +LABEL org.opencontainers.image.licenses="AGPL-3.0-only" LABEL org.opencontainers.image.documentation="https://matrix-org.github.io/dendrite/" LABEL org.opencontainers.image.vendor="The Matrix.org Foundation C.I.C." @@ -45,4 +45,3 @@ WORKDIR /etc/dendrite ENTRYPOINT ["/usr/bin/dendrite"] EXPOSE 8008 8448 - From 8b769d2cc44025ceb9e5df7acd5a6a9c72f0b443 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Thu, 17 Oct 2024 17:21:25 +0200 Subject: [PATCH 04/13] Fixup missed license headers --- clientapi/auth/authtypes/flow.go | 13 +--- clientapi/httputil/parse.go | 10 --- clientapi/routing/sendtodevice.go | 10 --- clientapi/routing/sendtyping.go | 10 --- clientapi/routing/whoami.go | 10 --- clientapi/userutil/userutil.go | 10 --- clientapi/userutil/userutil_test.go | 10 --- federationapi/routing/devices.go | 10 --- federationapi/routing/eventauth.go | 10 --- federationapi/routing/leave.go | 10 --- federationapi/routing/missingevents.go | 10 --- federationapi/routing/state.go | 10 --- internal/transactions/transactions.go | 10 --- internal/transactions/transactions_test.go | 10 --- roomserver/auth/auth.go | 10 --- test/slice.go | 10 --- test/wasm/index.js | 78 ++++++++++------------ 17 files changed, 36 insertions(+), 205 deletions(-) diff --git a/clientapi/auth/authtypes/flow.go b/clientapi/auth/authtypes/flow.go index 7388a5ebb..3dc1bba6c 100644 --- a/clientapi/auth/authtypes/flow.go +++ b/clientapi/auth/authtypes/flow.go @@ -1,16 +1,5 @@ -// Copyright Andrew Morgan -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and // Copyright 2024 New Vector Ltd. +// Copyright 2017 Andrew Morgan // // SPDX-License-Identifier: AGPL-3.0-only // Please see LICENSE in the repository root for full details. diff --git a/clientapi/httputil/parse.go b/clientapi/httputil/parse.go index f6ac7caaa..4eb7fb054 100644 --- a/clientapi/httputil/parse.go +++ b/clientapi/httputil/parse.go @@ -1,13 +1,3 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and // Copyright 2024 New Vector Ltd. // // SPDX-License-Identifier: AGPL-3.0-only diff --git a/clientapi/routing/sendtodevice.go b/clientapi/routing/sendtodevice.go index 11f36cd4f..3b6a65f5d 100644 --- a/clientapi/routing/sendtodevice.go +++ b/clientapi/routing/sendtodevice.go @@ -1,13 +1,3 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and // Copyright 2024 New Vector Ltd. // // SPDX-License-Identifier: AGPL-3.0-only diff --git a/clientapi/routing/sendtyping.go b/clientapi/routing/sendtyping.go index 1d2a53f4a..09d9c048d 100644 --- a/clientapi/routing/sendtyping.go +++ b/clientapi/routing/sendtyping.go @@ -1,13 +1,3 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and // Copyright 2024 New Vector Ltd. // // SPDX-License-Identifier: AGPL-3.0-only diff --git a/clientapi/routing/whoami.go b/clientapi/routing/whoami.go index 041f47493..80f58e879 100644 --- a/clientapi/routing/whoami.go +++ b/clientapi/routing/whoami.go @@ -1,13 +1,3 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and // Copyright 2024 New Vector Ltd. // // SPDX-License-Identifier: AGPL-3.0-only diff --git a/clientapi/userutil/userutil.go b/clientapi/userutil/userutil.go index aa8623b36..e271936a4 100644 --- a/clientapi/userutil/userutil.go +++ b/clientapi/userutil/userutil.go @@ -1,13 +1,3 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and // Copyright 2024 New Vector Ltd. // // SPDX-License-Identifier: AGPL-3.0-only diff --git a/clientapi/userutil/userutil_test.go b/clientapi/userutil/userutil_test.go index b68d574a1..743280ffe 100644 --- a/clientapi/userutil/userutil_test.go +++ b/clientapi/userutil/userutil_test.go @@ -1,13 +1,3 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and // Copyright 2024 New Vector Ltd. // // SPDX-License-Identifier: AGPL-3.0-only diff --git a/federationapi/routing/devices.go b/federationapi/routing/devices.go index 5e2fc52e2..ec1c4253f 100644 --- a/federationapi/routing/devices.go +++ b/federationapi/routing/devices.go @@ -1,13 +1,3 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and // Copyright 2024 New Vector Ltd. // // SPDX-License-Identifier: AGPL-3.0-only diff --git a/federationapi/routing/eventauth.go b/federationapi/routing/eventauth.go index 18cb42d66..df81b53e2 100644 --- a/federationapi/routing/eventauth.go +++ b/federationapi/routing/eventauth.go @@ -1,13 +1,3 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and // Copyright 2024 New Vector Ltd. // // SPDX-License-Identifier: AGPL-3.0-only diff --git a/federationapi/routing/leave.go b/federationapi/routing/leave.go index 89df7d802..76a5564bb 100644 --- a/federationapi/routing/leave.go +++ b/federationapi/routing/leave.go @@ -1,13 +1,3 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and // Copyright 2024 New Vector Ltd. // // SPDX-License-Identifier: AGPL-3.0-only diff --git a/federationapi/routing/missingevents.go b/federationapi/routing/missingevents.go index 1bd3b8f68..aa4fa0f3d 100644 --- a/federationapi/routing/missingevents.go +++ b/federationapi/routing/missingevents.go @@ -1,13 +1,3 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and // Copyright 2024 New Vector Ltd. // // SPDX-License-Identifier: AGPL-3.0-only diff --git a/federationapi/routing/state.go b/federationapi/routing/state.go index d9aa9f9f9..d24df0923 100644 --- a/federationapi/routing/state.go +++ b/federationapi/routing/state.go @@ -1,13 +1,3 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and // Copyright 2024 New Vector Ltd. // // SPDX-License-Identifier: AGPL-3.0-only diff --git a/internal/transactions/transactions.go b/internal/transactions/transactions.go index 479ade7b9..3796b5f8a 100644 --- a/internal/transactions/transactions.go +++ b/internal/transactions/transactions.go @@ -1,13 +1,3 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and // Copyright 2024 New Vector Ltd. // // SPDX-License-Identifier: AGPL-3.0-only diff --git a/internal/transactions/transactions_test.go b/internal/transactions/transactions_test.go index e11f79c8e..cc12c78fb 100644 --- a/internal/transactions/transactions_test.go +++ b/internal/transactions/transactions_test.go @@ -1,13 +1,3 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and // Copyright 2024 New Vector Ltd. // // SPDX-License-Identifier: AGPL-3.0-only diff --git a/roomserver/auth/auth.go b/roomserver/auth/auth.go index e605074f7..5971185c5 100644 --- a/roomserver/auth/auth.go +++ b/roomserver/auth/auth.go @@ -1,13 +1,3 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and // Copyright 2024 New Vector Ltd. // // SPDX-License-Identifier: AGPL-3.0-only diff --git a/test/slice.go b/test/slice.go index 8a0917d92..f73326e0b 100644 --- a/test/slice.go +++ b/test/slice.go @@ -1,13 +1,3 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and // Copyright 2024 New Vector Ltd. // // SPDX-License-Identifier: AGPL-3.0-only diff --git a/test/wasm/index.js b/test/wasm/index.js index fce5753c8..24d8d7fb9 100755 --- a/test/wasm/index.js +++ b/test/wasm/index.js @@ -1,52 +1,44 @@ #!/usr/bin/env node /* +Copyright 2024 New Vector Ltd. Copyright 2021 The Matrix.org Foundation C.I.C. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE in the repository root for full details. */ -const fs = require('fs'); -const path = require('path'); -const childProcess = require('child_process'); - -(async function() { - // sql.js - const initSqlJs = require('sql.js'); - await initSqlJs().then(SQL => { - global._go_sqlite = SQL; - console.log("Loaded sqlite") - }); - // dendritejs expects to write to `/idb` so we create that here - // Since this is testing only, we use the default in-memory FS - global._go_sqlite.FS.mkdir("/idb"); - - // WebSocket - const WebSocket = require('isomorphic-ws'); - global.WebSocket = WebSocket; - - // Load the generic Go Wasm exec helper inline to trigger built-in run call - // This approach avoids copying `wasm_exec.js` into the repo, which is nice - // to aim for since it can differ between Go versions. - const goRoot = await new Promise((resolve, reject) => { - childProcess.execFile('go', ['env', 'GOROOT'], (err, out) => { - if (err) { - reject("Can't find go"); - } - resolve(out.trim()); - }); +const fs = require("fs"); +const path = require("path"); +const childProcess = require("child_process"); + +(async function () { + // sql.js + const initSqlJs = require("sql.js"); + await initSqlJs().then((SQL) => { + global._go_sqlite = SQL; + console.log("Loaded sqlite"); + }); + // dendritejs expects to write to `/idb` so we create that here + // Since this is testing only, we use the default in-memory FS + global._go_sqlite.FS.mkdir("/idb"); + + // WebSocket + const WebSocket = require("isomorphic-ws"); + global.WebSocket = WebSocket; + + // Load the generic Go Wasm exec helper inline to trigger built-in run call + // This approach avoids copying `wasm_exec.js` into the repo, which is nice + // to aim for since it can differ between Go versions. + const goRoot = await new Promise((resolve, reject) => { + childProcess.execFile("go", ["env", "GOROOT"], (err, out) => { + if (err) { + reject("Can't find go"); + } + resolve(out.trim()); }); - const execPath = path.join(goRoot, 'misc/wasm/wasm_exec.js'); - const execCode = fs.readFileSync(execPath, 'utf8'); - eval(execCode); + }); + const execPath = path.join(goRoot, "misc/wasm/wasm_exec.js"); + const execCode = fs.readFileSync(execPath, "utf8"); + eval(execCode); })(); From 6d327dc73cbab650f19735eb9724c3b060eaaac3 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Thu, 17 Oct 2024 17:32:29 +0200 Subject: [PATCH 05/13] fixup! Update license in Docker image annotations --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a703529d0..15ec7edae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,10 +30,10 @@ FROM alpine:latest RUN apk --update --no-cache add curl LABEL org.opencontainers.image.title="Dendrite" LABEL org.opencontainers.image.description="Next-generation Matrix homeserver written in Go" -LABEL org.opencontainers.image.source="https://github.com/matrix-org/dendrite" +LABEL org.opencontainers.image.source="https://github.com/element-hq/dendrite" LABEL org.opencontainers.image.licenses="AGPL-3.0-only" -LABEL org.opencontainers.image.documentation="https://matrix-org.github.io/dendrite/" -LABEL org.opencontainers.image.vendor="The Matrix.org Foundation C.I.C." +LABEL org.opencontainers.image.documentation="https://element-hq.github.io/dendrite/" +LABEL org.opencontainers.image.vendor="New Vector Ltd." COPY --from=build /out/create-account /usr/bin/create-account COPY --from=build /out/generate-config /usr/bin/generate-config From 6e6c3de0a6d93cd9e91234ce48e7968eb77e25e9 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Thu, 17 Oct 2024 17:33:45 +0200 Subject: [PATCH 06/13] Rename the go package github.com/matrix-org/dendrite to github.com/element-hq/dendrite --- appservice/api/query.go | 4 +- appservice/appservice.go | 16 +++---- appservice/appservice_test.go | 38 +++++++-------- appservice/consumers/roomserver.go | 14 +++--- appservice/query/query.go | 6 +-- clientapi/admin_test.go | 30 ++++++------ clientapi/auth/auth.go | 2 +- clientapi/auth/login.go | 6 +-- clientapi/auth/login_application_service.go | 8 ++-- clientapi/auth/login_test.go | 6 +-- clientapi/auth/login_token.go | 8 ++-- clientapi/auth/password.go | 10 ++-- clientapi/auth/user_interactive.go | 4 +- clientapi/auth/user_interactive_test.go | 4 +- clientapi/clientapi.go | 24 +++++----- clientapi/clientapi_test.go | 38 +++++++-------- clientapi/producers/syncapi.go | 6 +-- clientapi/routing/account_data.go | 10 ++-- clientapi/routing/admin.go | 18 ++++---- clientapi/routing/admin_whois.go | 2 +- clientapi/routing/aliases.go | 4 +- clientapi/routing/auth_fallback.go | 4 +- clientapi/routing/auth_fallback_test.go | 4 +- clientapi/routing/capabilities.go | 4 +- clientapi/routing/createroom.go | 12 ++--- clientapi/routing/deactivate.go | 4 +- clientapi/routing/device.go | 6 +-- clientapi/routing/directory.go | 10 ++-- clientapi/routing/directory_public.go | 8 ++-- clientapi/routing/joined_rooms.go | 4 +- clientapi/routing/joinroom.go | 10 ++-- clientapi/routing/joinroom_test.go | 20 ++++---- clientapi/routing/key_backup.go | 4 +- clientapi/routing/key_crosssigning.go | 10 ++-- clientapi/routing/keys.go | 4 +- clientapi/routing/leaveroom.go | 4 +- clientapi/routing/login.go | 10 ++-- clientapi/routing/login_test.go | 22 ++++----- clientapi/routing/logout.go | 2 +- clientapi/routing/membership.go | 20 ++++---- clientapi/routing/memberships.go | 4 +- clientapi/routing/notification.go | 2 +- clientapi/routing/openid.go | 4 +- clientapi/routing/password.go | 12 ++--- clientapi/routing/peekroom.go | 4 +- clientapi/routing/presence.go | 12 ++--- clientapi/routing/profile.go | 16 +++---- clientapi/routing/pusher.go | 4 +- clientapi/routing/pushrules.go | 4 +- clientapi/routing/receipt.go | 4 +- clientapi/routing/redaction.go | 14 +++--- clientapi/routing/register.go | 16 +++---- clientapi/routing/register_secret.go | 2 +- clientapi/routing/register_test.go | 22 ++++----- clientapi/routing/report_event.go | 6 +-- clientapi/routing/room_hierarchy.go | 6 +-- clientapi/routing/room_tagging.go | 6 +-- clientapi/routing/routing.go | 28 +++++------ clientapi/routing/sendevent.go | 16 +++---- clientapi/routing/sendevent_test.go | 8 ++-- clientapi/routing/sendtodevice.go | 8 ++-- clientapi/routing/sendtyping.go | 8 ++-- clientapi/routing/server_notices.go | 18 ++++---- clientapi/routing/state.go | 8 ++-- clientapi/routing/state_test.go | 8 ++-- clientapi/routing/thirdparty.go | 4 +- clientapi/routing/threepid.go | 12 ++--- clientapi/routing/upgrade_room.go | 14 +++--- clientapi/routing/userdirectory.go | 6 +-- clientapi/routing/voip.go | 4 +- clientapi/routing/whoami.go | 2 +- clientapi/threepid/invites.go | 12 ++--- clientapi/threepid/threepid.go | 2 +- clientapi/userutil/userutil.go | 2 +- clientapi/userutil/userutil_test.go | 2 +- cmd/create-account/main.go | 4 +- cmd/dendrite-demo-pinecone/conn/client.go | 2 +- cmd/dendrite-demo-pinecone/main.go | 16 +++---- cmd/dendrite-demo-pinecone/monolith/keys.go | 4 +- .../monolith/monolith.go | 46 +++++++++---------- cmd/dendrite-demo-pinecone/relay/retriever.go | 4 +- .../relay/retriever_test.go | 4 +- cmd/dendrite-demo-pinecone/rooms/rooms.go | 4 +- cmd/dendrite-demo-pinecone/users/users.go | 8 ++-- cmd/dendrite-demo-yggdrasil/main.go | 40 ++++++++-------- cmd/dendrite-demo-yggdrasil/yggconn/client.go | 2 +- .../yggrooms/yggrooms.go | 4 +- cmd/dendrite-upgrade-tests/main.go | 6 +-- cmd/dendrite/main.go | 28 +++++------ cmd/generate-config/main.go | 2 +- cmd/generate-keys/main.go | 2 +- cmd/resolve-state/main.go | 16 +++---- contrib/dendrite-demo-i2p/main.go | 28 +++++------ contrib/dendrite-demo-i2p/main_i2p.go | 10 ++-- contrib/dendrite-demo-tor/main.go | 28 +++++------ contrib/dendrite-demo-tor/main_tor.go | 10 ++-- federationapi/api/api.go | 4 +- federationapi/consumers/keychange.go | 16 +++---- federationapi/consumers/presence.go | 16 +++---- federationapi/consumers/receipts.go | 14 +++--- federationapi/consumers/roomserver.go | 16 +++---- federationapi/consumers/sendtodevice.go | 12 ++--- federationapi/consumers/typing.go | 10 ++-- federationapi/federationapi.go | 32 ++++++------- federationapi/federationapi_keys_test.go | 14 +++--- federationapi/federationapi_test.go | 26 +++++------ federationapi/internal/api.go | 16 +++---- .../internal/federationclient_test.go | 10 ++-- federationapi/internal/perform.go | 12 ++--- federationapi/internal/perform_test.go | 12 ++--- federationapi/internal/query.go | 2 +- federationapi/producers/syncapi.go | 8 ++-- federationapi/queue/destinationqueue.go | 10 ++-- federationapi/queue/queue.go | 10 ++-- federationapi/queue/queue_test.go | 18 ++++---- federationapi/routing/backfill.go | 6 +-- federationapi/routing/devices.go | 2 +- federationapi/routing/eventauth.go | 4 +- federationapi/routing/events.go | 2 +- federationapi/routing/invite.go | 6 +-- federationapi/routing/join.go | 8 ++-- federationapi/routing/keys.go | 8 ++-- federationapi/routing/leave.go | 8 ++-- federationapi/routing/missingevents.go | 4 +- federationapi/routing/openid.go | 2 +- federationapi/routing/peek.go | 6 +-- federationapi/routing/profile.go | 8 ++-- federationapi/routing/profile_test.go | 22 ++++----- federationapi/routing/publicrooms.go | 4 +- federationapi/routing/query.go | 8 ++-- federationapi/routing/query_test.go | 18 ++++---- federationapi/routing/routing.go | 16 +++---- federationapi/routing/send.go | 10 ++-- federationapi/routing/send_test.go | 18 ++++---- federationapi/routing/state.go | 4 +- federationapi/routing/threepid.go | 10 ++-- federationapi/routing/version.go | 2 +- federationapi/statistics/statistics.go | 2 +- federationapi/statistics/statistics_test.go | 2 +- federationapi/storage/cache/keydb.go | 2 +- federationapi/storage/interface.go | 6 +-- .../storage/postgres/assumed_offline_table.go | 2 +- .../storage/postgres/blacklist_table.go | 2 +- .../storage/postgres/inbound_peeks_table.go | 6 +-- .../storage/postgres/joined_hosts_table.go | 6 +-- .../postgres/notary_server_keys_json_table.go | 4 +- .../notary_server_keys_metadata_table.go | 6 +-- .../storage/postgres/outbound_peeks_table.go | 6 +-- .../storage/postgres/queue_edus_table.go | 6 +-- .../storage/postgres/queue_json_table.go | 4 +- .../storage/postgres/queue_pdus_table.go | 4 +- .../storage/postgres/relay_servers_table.go | 4 +- .../storage/postgres/server_key_table.go | 4 +- federationapi/storage/postgres/storage.go | 10 ++-- federationapi/storage/shared/storage.go | 10 ++-- federationapi/storage/shared/storage_edus.go | 2 +- federationapi/storage/shared/storage_pdus.go | 4 +- .../storage/sqlite3/assumed_offline_table.go | 2 +- .../storage/sqlite3/blacklist_table.go | 2 +- .../storage/sqlite3/inbound_peeks_table.go | 6 +-- .../storage/sqlite3/joined_hosts_table.go | 6 +-- .../sqlite3/notary_server_keys_json_table.go | 4 +- .../notary_server_keys_metadata_table.go | 6 +-- .../storage/sqlite3/outbound_peeks_table.go | 6 +-- .../storage/sqlite3/queue_edus_table.go | 6 +-- .../storage/sqlite3/queue_json_table.go | 4 +- .../storage/sqlite3/queue_pdus_table.go | 4 +- .../storage/sqlite3/relay_servers_table.go | 4 +- .../storage/sqlite3/server_key_table.go | 2 +- federationapi/storage/sqlite3/storage.go | 10 ++-- federationapi/storage/storage.go | 10 ++-- federationapi/storage/storage_test.go | 10 ++-- federationapi/storage/storage_wasm.go | 8 ++-- .../tables/inbound_peeks_table_test.go | 12 ++--- federationapi/storage/tables/interface.go | 2 +- .../tables/outbound_peeks_table_test.go | 12 ++--- .../tables/relay_servers_table_test.go | 12 ++--- .../storage/tables/server_key_table_test.go | 12 ++--- go.mod | 2 +- internal/caching/cache_eventstatekeys.go | 2 +- internal/caching/cache_federationevents.go | 2 +- internal/caching/cache_lazy_load_members.go | 2 +- internal/caching/cache_roomevents.go | 2 +- internal/caching/cache_roomservernids.go | 2 +- internal/caching/cache_typing_test.go | 2 +- internal/caching/caches.go | 2 +- internal/caching/impl_ristretto.go | 4 +- internal/eventutil/events.go | 6 +-- internal/eventutil/types.go | 2 +- internal/fulltext/bleve.go | 4 +- internal/fulltext/bleve_test.go | 6 +-- internal/fulltext/bleve_wasm.go | 2 +- internal/httputil/httpapi.go | 6 +-- internal/httputil/rate_limiting.go | 4 +- internal/log.go | 2 +- internal/log_unix.go | 2 +- internal/log_windows.go | 2 +- internal/pushgateway/client.go | 2 +- internal/sqlutil/connection_manager.go | 4 +- internal/sqlutil/connection_manager_test.go | 8 ++-- internal/sqlutil/migrate.go | 2 +- internal/sqlutil/migrate_test.go | 4 +- internal/sqlutil/sqlutil.go | 2 +- internal/sqlutil/uri.go | 2 +- internal/transactionrequest.go | 12 ++--- internal/transactionrequest_test.go | 18 ++++---- internal/validate.go | 4 +- internal/validate_test.go | 2 +- internal/version.go | 4 +- mediaapi/fileutils/fileutils.go | 4 +- mediaapi/mediaapi.go | 12 ++--- mediaapi/routing/download.go | 10 ++-- mediaapi/routing/download_test.go | 2 +- mediaapi/routing/routing.go | 12 ++--- mediaapi/routing/upload.go | 12 ++--- mediaapi/routing/upload_test.go | 10 ++-- mediaapi/storage/interface.go | 2 +- .../postgres/media_repository_table.go | 6 +-- mediaapi/storage/postgres/mediaapi.go | 6 +-- mediaapi/storage/postgres/thumbnail_table.go | 8 ++-- mediaapi/storage/shared/mediaapi.go | 6 +-- .../storage/sqlite3/media_repository_table.go | 6 +-- mediaapi/storage/sqlite3/mediaapi.go | 6 +-- mediaapi/storage/sqlite3/thumbnail_table.go | 8 ++-- mediaapi/storage/storage.go | 8 ++-- mediaapi/storage/storage_test.go | 10 ++-- mediaapi/storage/storage_wasm.go | 6 +-- mediaapi/storage/tables/interface.go | 2 +- mediaapi/thumbnailer/thumbnailer.go | 6 +-- mediaapi/thumbnailer/thumbnailer_bimg.go | 6 +-- mediaapi/thumbnailer/thumbnailer_nfnt.go | 6 +-- mediaapi/types/types.go | 2 +- relayapi/internal/api.go | 6 +-- relayapi/internal/perform.go | 6 +-- relayapi/internal/perform_test.go | 6 +-- relayapi/relayapi.go | 20 ++++---- relayapi/relayapi_test.go | 14 +++--- relayapi/routing/relaytxn.go | 2 +- relayapi/routing/relaytxn_test.go | 10 ++-- relayapi/routing/routing.go | 6 +-- relayapi/routing/sendrelay.go | 2 +- relayapi/routing/sendrelay_test.go | 10 ++-- relayapi/storage/interface.go | 2 +- .../postgres/relay_queue_json_table.go | 4 +- .../storage/postgres/relay_queue_table.go | 4 +- relayapi/storage/postgres/storage.go | 8 ++-- relayapi/storage/shared/storage.go | 8 ++-- .../storage/sqlite3/relay_queue_json_table.go | 4 +- relayapi/storage/sqlite3/relay_queue_table.go | 4 +- relayapi/storage/sqlite3/storage.go | 8 ++-- relayapi/storage/storage.go | 10 ++-- relayapi/storage/storage_wasm.go | 8 ++-- .../tables/relay_queue_json_table_test.go | 12 ++--- .../storage/tables/relay_queue_table_test.go | 12 ++--- roomserver/acls/acls.go | 2 +- roomserver/acls/acls_test.go | 2 +- roomserver/api/api.go | 8 ++-- roomserver/api/input.go | 2 +- roomserver/api/output.go | 2 +- roomserver/api/perform.go | 2 +- roomserver/api/query.go | 6 +-- roomserver/api/wrapper.go | 2 +- roomserver/auth/auth.go | 2 +- roomserver/auth/auth_test.go | 4 +- roomserver/internal/alias.go | 10 ++-- roomserver/internal/api.go | 30 ++++++------ roomserver/internal/helpers/auth.go | 8 ++-- roomserver/internal/helpers/auth_test.go | 2 +- roomserver/internal/helpers/helpers.go | 14 +++--- roomserver/internal/helpers/helpers_test.go | 12 ++--- roomserver/internal/input/input.go | 22 ++++----- roomserver/internal/input/input_events.go | 24 +++++----- .../internal/input/input_events_test.go | 2 +- .../internal/input/input_latest_events.go | 12 ++--- roomserver/internal/input/input_membership.go | 12 ++--- roomserver/internal/input/input_missing.go | 12 ++--- roomserver/internal/input/input_test.go | 18 ++++---- roomserver/internal/perform/perform_admin.go | 14 +++--- .../internal/perform/perform_backfill.go | 14 +++--- .../internal/perform/perform_create_room.go | 10 ++-- roomserver/internal/perform/perform_forget.go | 4 +- .../internal/perform/perform_inbound_peek.go | 14 +++--- roomserver/internal/perform/perform_invite.go | 18 ++++---- roomserver/internal/perform/perform_join.go | 20 ++++---- roomserver/internal/perform/perform_leave.go | 18 ++++---- roomserver/internal/perform/perform_peek.go | 10 ++-- .../internal/perform/perform_publish.go | 4 +- roomserver/internal/perform/perform_unpeek.go | 8 ++-- .../internal/perform/perform_upgrade.go | 8 ++-- roomserver/internal/query/query.go | 28 +++++------ .../internal/query/query_room_hierarchy.go | 8 ++-- roomserver/internal/query/query_test.go | 12 ++--- roomserver/producers/roomevent.go | 8 ++-- roomserver/roomserver.go | 16 +++---- roomserver/roomserver_test.go | 40 ++++++++-------- roomserver/state/state.go | 6 +-- roomserver/state/state_test.go | 2 +- roomserver/storage/interface.go | 10 ++-- .../2021041615092700_state_blocks_refactor.go | 2 +- .../20230516154000_drop_reference_sha.go | 2 +- .../20230516154000_drop_reference_sha_test.go | 6 +-- .../storage/postgres/event_json_table.go | 8 ++-- .../postgres/event_state_keys_table.go | 8 ++-- .../storage/postgres/event_types_table.go | 8 ++-- roomserver/storage/postgres/events_table.go | 10 ++-- roomserver/storage/postgres/invite_table.go | 8 ++-- .../storage/postgres/membership_table.go | 10 ++-- .../storage/postgres/previous_events_table.go | 8 ++-- .../storage/postgres/published_table.go | 8 ++-- .../storage/postgres/purge_statements.go | 4 +- .../storage/postgres/redactions_table.go | 4 +- .../storage/postgres/reported_events_table.go | 10 ++-- .../storage/postgres/room_aliases_table.go | 6 +-- roomserver/storage/postgres/rooms_table.go | 8 ++-- .../storage/postgres/state_block_table.go | 8 ++-- .../storage/postgres/state_snapshot_table.go | 8 ++-- roomserver/storage/postgres/storage.go | 10 ++-- .../storage/postgres/user_room_keys_table.go | 8 ++-- .../storage/shared/membership_updater.go | 4 +- roomserver/storage/shared/room_updater.go | 2 +- roomserver/storage/shared/storage.go | 14 +++--- roomserver/storage/shared/storage_test.go | 18 ++++---- .../2021041615092700_state_blocks_refactor.go | 4 +- .../20230516154000_drop_reference_sha.go | 2 +- .../20230516154000_drop_reference_sha_test.go | 6 +-- .../storage/sqlite3/event_json_table.go | 8 ++-- .../storage/sqlite3/event_state_keys_table.go | 8 ++-- .../storage/sqlite3/event_types_table.go | 8 ++-- roomserver/storage/sqlite3/events_table.go | 10 ++-- roomserver/storage/sqlite3/invite_table.go | 8 ++-- .../storage/sqlite3/membership_table.go | 10 ++-- .../storage/sqlite3/previous_events_table.go | 8 ++-- roomserver/storage/sqlite3/published_table.go | 8 ++-- .../storage/sqlite3/purge_statements.go | 4 +- .../storage/sqlite3/redactions_table.go | 4 +- .../storage/sqlite3/reported_events_table.go | 10 ++-- .../storage/sqlite3/room_aliases_table.go | 6 +-- roomserver/storage/sqlite3/rooms_table.go | 8 ++-- .../storage/sqlite3/state_block_table.go | 6 +-- .../storage/sqlite3/state_snapshot_table.go | 8 ++-- roomserver/storage/sqlite3/storage.go | 12 ++--- .../storage/sqlite3/user_room_keys_table.go | 8 ++-- roomserver/storage/storage.go | 10 ++-- roomserver/storage/storage_wasm.go | 8 ++-- .../storage/tables/event_json_table_test.go | 14 +++--- .../tables/event_state_keys_table_test.go | 14 +++--- .../storage/tables/event_types_table_test.go | 14 +++--- .../storage/tables/events_table_test.go | 14 +++--- roomserver/storage/tables/interface.go | 4 +- roomserver/storage/tables/interface_test.go | 4 +- .../storage/tables/invite_table_test.go | 14 +++--- .../storage/tables/membership_table_test.go | 14 +++--- .../tables/previous_events_table_test.go | 12 ++--- .../storage/tables/published_table_test.go | 12 ++--- .../storage/tables/redactions_table_test.go | 12 ++--- .../storage/tables/room_aliases_table_test.go | 12 ++--- roomserver/storage/tables/rooms_table_test.go | 14 +++--- .../storage/tables/state_block_table_test.go | 14 +++--- .../tables/state_snapshot_table_test.go | 14 +++--- .../tables/user_room_keys_table_test.go | 14 +++--- roomserver/types/types.go | 2 +- setup/base/base.go | 8 ++-- setup/base/base_test.go | 10 ++-- setup/config/config.go | 2 +- setup/flags.go | 4 +- setup/jetstream/nats.go | 4 +- setup/monolith.go | 36 +++++++-------- setup/mscs/msc2836/msc2836.go | 18 ++++---- setup/mscs/msc2836/msc2836_test.go | 20 ++++---- setup/mscs/msc2836/storage.go | 6 +-- setup/mscs/mscs.go | 12 ++--- syncapi/consumers/clientapi.go | 18 ++++---- syncapi/consumers/keychange.go | 18 ++++---- syncapi/consumers/presence.go | 16 +++---- syncapi/consumers/receipts.go | 14 +++--- syncapi/consumers/roomserver.go | 26 +++++------ syncapi/consumers/sendtodevice.go | 16 +++---- syncapi/consumers/typing.go | 14 +++--- syncapi/consumers/userapi.go | 16 +++---- syncapi/internal/history_visibility.go | 6 +-- syncapi/internal/history_visibility_test.go | 6 +-- syncapi/internal/keychange.go | 12 ++--- syncapi/internal/keychange_test.go | 8 ++-- syncapi/notifier/notifier.go | 10 ++-- syncapi/notifier/notifier_test.go | 8 ++-- syncapi/notifier/userstream.go | 2 +- syncapi/producers/federationapi_presence.go | 4 +- syncapi/routing/context.go | 18 ++++---- syncapi/routing/context_test.go | 2 +- syncapi/routing/filter.go | 8 ++-- syncapi/routing/getevent.go | 12 ++--- syncapi/routing/memberships.go | 10 ++-- syncapi/routing/messages.go | 22 ++++----- syncapi/routing/relations.go | 16 +++---- syncapi/routing/routing.go | 16 +++---- syncapi/routing/search.go | 16 +++---- syncapi/routing/search_test.go | 20 ++++---- syncapi/storage/interface.go | 16 +++---- .../storage/postgres/account_data_table.go | 10 ++-- .../postgres/backwards_extremities_table.go | 6 +-- .../postgres/current_room_state_table.go | 14 +++--- ...2061412000000_history_visibility_column.go | 2 +- syncapi/storage/postgres/filter_table.go | 6 +-- syncapi/storage/postgres/filtering.go | 2 +- syncapi/storage/postgres/ignores_table.go | 6 +-- syncapi/storage/postgres/invites_table.go | 10 ++-- syncapi/storage/postgres/memberships_table.go | 10 ++-- .../postgres/notification_data_table.go | 10 ++-- .../postgres/output_room_events_table.go | 16 +++---- .../output_room_events_topology_table.go | 10 ++-- syncapi/storage/postgres/peeks_table.go | 8 ++-- syncapi/storage/postgres/presence_table.go | 8 ++-- syncapi/storage/postgres/receipt_table.go | 10 ++-- syncapi/storage/postgres/relations_table.go | 8 ++-- .../storage/postgres/send_to_device_table.go | 10 ++-- syncapi/storage/postgres/syncserver.go | 8 ++-- syncapi/storage/shared/storage_consumer.go | 16 +++---- .../storage/shared/storage_consumer_test.go | 12 ++--- syncapi/storage/shared/storage_sync.go | 12 ++--- syncapi/storage/shared/storage_sync_test.go | 2 +- syncapi/storage/sqlite3/account_data_table.go | 10 ++-- .../sqlite3/backwards_extremities_table.go | 6 +-- .../sqlite3/current_room_state_table.go | 14 +++--- ...2061412000000_history_visibility_column.go | 2 +- syncapi/storage/sqlite3/filter_table.go | 6 +-- syncapi/storage/sqlite3/filtering.go | 2 +- syncapi/storage/sqlite3/ignores_table.go | 6 +-- syncapi/storage/sqlite3/invites_table.go | 10 ++-- syncapi/storage/sqlite3/memberships_table.go | 10 ++-- .../sqlite3/notification_data_table.go | 10 ++-- .../sqlite3/output_room_events_table.go | 16 +++---- .../output_room_events_topology_table.go | 10 ++-- syncapi/storage/sqlite3/peeks_table.go | 8 ++-- syncapi/storage/sqlite3/presence_table.go | 8 ++-- syncapi/storage/sqlite3/receipt_table.go | 10 ++-- syncapi/storage/sqlite3/relations_table.go | 8 ++-- .../storage/sqlite3/send_to_device_table.go | 10 ++-- syncapi/storage/sqlite3/stream_id_table.go | 4 +- syncapi/storage/sqlite3/syncserver.go | 8 ++-- syncapi/storage/storage.go | 8 ++-- syncapi/storage/storage_test.go | 16 +++---- syncapi/storage/storage_wasm.go | 6 +-- .../storage/tables/current_room_state_test.go | 16 +++---- syncapi/storage/tables/interface.go | 10 ++-- syncapi/storage/tables/memberships_test.go | 16 +++---- .../storage/tables/output_room_events_test.go | 14 +++--- syncapi/storage/tables/presence_table_test.go | 16 +++---- syncapi/storage/tables/relations_test.go | 14 +++--- syncapi/storage/tables/topology_test.go | 14 +++--- syncapi/streams/stream_accountdata.go | 8 ++-- syncapi/streams/stream_devicelist.go | 10 ++-- syncapi/streams/stream_invite.go | 8 ++-- syncapi/streams/stream_notificationdata.go | 6 +-- syncapi/streams/stream_pdu.go | 18 ++++---- syncapi/streams/stream_presence.go | 8 ++-- syncapi/streams/stream_receipt.go | 6 +-- syncapi/streams/stream_sendtodevice.go | 4 +- syncapi/streams/stream_typing.go | 8 ++-- syncapi/streams/streamprovider.go | 4 +- syncapi/streams/streams.go | 14 +++--- syncapi/streams/template_stream.go | 4 +- syncapi/sync/request.go | 8 ++-- syncapi/sync/requestpool.go | 18 ++++---- syncapi/sync/requestpool_test.go | 6 +-- syncapi/syncapi.go | 32 ++++++------- syncapi/syncapi_test.go | 36 +++++++-------- syncapi/types/provider.go | 4 +- syncapi/types/types.go | 6 +-- syncapi/types/types_test.go | 4 +- test/event.go | 2 +- test/memory_federation_db.go | 6 +-- test/room.go | 4 +- test/testrig/base.go | 6 +-- test/testrig/jetstream.go | 6 +-- test/user.go | 2 +- userapi/api/api.go | 10 ++-- userapi/consumers/clientapi.go | 16 +++---- userapi/consumers/devicelistupdate.go | 8 ++-- userapi/consumers/roomserver.go | 32 ++++++------- userapi/consumers/roomserver_test.go | 24 +++++----- userapi/consumers/signingkeyupdate.go | 8 ++-- userapi/internal/api_logintoken.go | 2 +- userapi/internal/cross_signing.go | 4 +- userapi/internal/device_list_update.go | 10 ++-- userapi/internal/device_list_update_test.go | 20 ++++---- userapi/internal/key_api.go | 2 +- userapi/internal/key_api_test.go | 12 ++--- userapi/internal/user_api.go | 34 +++++++------- userapi/producers/keychange.go | 6 +-- userapi/producers/syncapi.go | 6 +-- userapi/storage/interface.go | 12 ++--- .../storage/postgres/account_data_table.go | 6 +-- userapi/storage/postgres/accounts_table.go | 10 ++-- .../postgres/cross_signing_keys_table.go | 8 ++-- .../postgres/cross_signing_sigs_table.go | 10 ++-- userapi/storage/postgres/device_keys_table.go | 8 ++-- userapi/storage/postgres/devices_table.go | 12 ++--- userapi/storage/postgres/key_backup_table.go | 8 ++-- .../postgres/key_backup_version_table.go | 4 +- userapi/storage/postgres/key_changes_table.go | 8 ++-- userapi/storage/postgres/logintoken_table.go | 6 +-- .../storage/postgres/notifications_table.go | 8 ++-- .../storage/postgres/one_time_keys_table.go | 8 ++-- userapi/storage/postgres/openid_table.go | 6 +-- userapi/storage/postgres/profile_table.go | 8 ++-- userapi/storage/postgres/pusher_table.go | 8 ++-- .../postgres/registration_tokens_table.go | 8 ++-- .../storage/postgres/stale_device_lists.go | 6 +-- userapi/storage/postgres/stats_table.go | 10 ++-- userapi/storage/postgres/storage.go | 8 ++-- userapi/storage/postgres/threepid_table.go | 8 ++-- userapi/storage/shared/storage.go | 14 +++--- userapi/storage/sqlite3/account_data_table.go | 6 +-- userapi/storage/sqlite3/accounts_table.go | 10 ++-- .../sqlite3/cross_signing_keys_table.go | 8 ++-- .../sqlite3/cross_signing_sigs_table.go | 10 ++-- userapi/storage/sqlite3/device_keys_table.go | 8 ++-- userapi/storage/sqlite3/devices_table.go | 12 ++--- userapi/storage/sqlite3/key_backup_table.go | 8 ++-- .../sqlite3/key_backup_version_table.go | 4 +- userapi/storage/sqlite3/key_changes_table.go | 8 ++-- userapi/storage/sqlite3/logintoken_table.go | 6 +-- .../storage/sqlite3/notifications_table.go | 8 ++-- .../storage/sqlite3/one_time_keys_table.go | 8 ++-- userapi/storage/sqlite3/openid_table.go | 6 +-- userapi/storage/sqlite3/profile_table.go | 8 ++-- userapi/storage/sqlite3/pusher_table.go | 8 ++-- .../sqlite3/registration_tokens_table.go | 8 ++-- userapi/storage/sqlite3/stale_device_lists.go | 6 +-- userapi/storage/sqlite3/stats_table.go | 10 ++-- userapi/storage/sqlite3/storage.go | 8 ++-- userapi/storage/sqlite3/threepid_table.go | 8 ++-- userapi/storage/storage.go | 8 ++-- userapi/storage/storage_test.go | 22 ++++----- userapi/storage/storage_wasm.go | 6 +-- userapi/storage/tables/interface.go | 8 ++-- .../storage/tables/stale_device_lists_test.go | 12 ++--- userapi/storage/tables/stats_table_test.go | 16 +++---- userapi/userapi.go | 28 +++++------ userapi/userapi_test.go | 22 ++++----- userapi/util/devices.go | 6 +-- userapi/util/notify.go | 6 +-- userapi/util/notify_test.go | 16 +++---- userapi/util/phonehomestats.go | 6 +-- userapi/util/phonehomestats_test.go | 10 ++-- 545 files changed, 2508 insertions(+), 2508 deletions(-) diff --git a/appservice/api/query.go b/appservice/api/query.go index 38b0ab27f..3b942e9f4 100644 --- a/appservice/api/query.go +++ b/appservice/api/query.go @@ -13,8 +13,8 @@ import ( "encoding/json" "errors" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + userapi "github.com/element-hq/dendrite/userapi/api" ) // AppServiceInternalAPI is used to query user and room alias data from application diff --git a/appservice/appservice.go b/appservice/appservice.go index 99e76ba8a..4d3186e53 100644 --- a/appservice/appservice.go +++ b/appservice/appservice.go @@ -10,17 +10,17 @@ import ( "context" "sync" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/sirupsen/logrus" - appserviceAPI "github.com/matrix-org/dendrite/appservice/api" - "github.com/matrix-org/dendrite/appservice/consumers" - "github.com/matrix-org/dendrite/appservice/query" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + appserviceAPI "github.com/element-hq/dendrite/appservice/api" + "github.com/element-hq/dendrite/appservice/consumers" + "github.com/element-hq/dendrite/appservice/query" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" ) // NewInternalAPI returns a concerete implementation of the internal API. Callers diff --git a/appservice/appservice_test.go b/appservice/appservice_test.go index aa2af9f24..b7cd88562 100644 --- a/appservice/appservice_test.go +++ b/appservice/appservice_test.go @@ -14,33 +14,33 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/clientapi" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/federationapi/statistics" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi" - uapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/federationapi/statistics" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi" + uapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/tidwall/gjson" - "github.com/matrix-org/dendrite/appservice" - "github.com/matrix-org/dendrite/appservice/api" - "github.com/matrix-org/dendrite/appservice/consumers" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver" - rsapi "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/userapi" + "github.com/element-hq/dendrite/appservice" + "github.com/element-hq/dendrite/appservice/api" + "github.com/element-hq/dendrite/appservice/consumers" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver" + rsapi "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/userapi" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/test/testrig" + "github.com/element-hq/dendrite/test/testrig" ) var testIsBlacklistedOrBackingOff = func(s spec.ServerName) (*statistics.ServerStatistics, error) { diff --git a/appservice/consumers/roomserver.go b/appservice/consumers/roomserver.go index 08aef5153..698382d0e 100644 --- a/appservice/consumers/roomserver.go +++ b/appservice/consumers/roomserver.go @@ -21,12 +21,12 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "github.com/nats-io/nats.go" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/syncapi/synctypes" log "github.com/sirupsen/logrus" ) @@ -243,7 +243,7 @@ func (s *appserviceState) backoffAndPause(err error) error { // appserviceIsInterestedInEvent returns a boolean depending on whether a given // event falls within one of a given application service's namespaces. // -// TODO: This should be cached, see https://github.com/matrix-org/dendrite/issues/1682 +// TODO: This should be cached, see https://github.com/element-hq/dendrite/issues/1682 func (s *OutputRoomEventConsumer) appserviceIsInterestedInEvent(ctx context.Context, event *types.HeaderedEvent, appservice *config.ApplicationService) bool { user := "" userID, err := s.rsAPI.QueryUserIDForSender(ctx, event.RoomID(), event.SenderID()) diff --git a/appservice/query/query.go b/appservice/query/query.go index 1783db9fd..01c1ce73c 100644 --- a/appservice/query/query.go +++ b/appservice/query/query.go @@ -18,9 +18,9 @@ import ( log "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/appservice/api" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/appservice/api" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/setup/config" ) // AppServiceQueryAPI is an implementation of api.AppServiceQueryAPI diff --git a/clientapi/admin_test.go b/clientapi/admin_test.go index b2adeb757..d3c5bcee0 100644 --- a/clientapi/admin_test.go +++ b/clientapi/admin_test.go @@ -11,26 +11,26 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/federationapi" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/roomserver/api" - basepkg "github.com/matrix-org/dendrite/setup/base" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/syncapi" + "github.com/element-hq/dendrite/federationapi" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver" + "github.com/element-hq/dendrite/roomserver/api" + basepkg "github.com/element-hq/dendrite/setup/base" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/syncapi" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" "github.com/tidwall/gjson" - capi "github.com/matrix-org/dendrite/clientapi/api" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" - "github.com/matrix-org/dendrite/userapi" - uapi "github.com/matrix-org/dendrite/userapi/api" + capi "github.com/element-hq/dendrite/clientapi/api" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" + "github.com/element-hq/dendrite/userapi" + uapi "github.com/element-hq/dendrite/userapi/api" ) func TestAdminCreateToken(t *testing.T) { diff --git a/clientapi/auth/auth.go b/clientapi/auth/auth.go index 6740cbbb3..c1225a91c 100644 --- a/clientapi/auth/auth.go +++ b/clientapi/auth/auth.go @@ -15,7 +15,7 @@ import ( "net/http" "strings" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/clientapi/auth/login.go b/clientapi/auth/login.go index fe7aecbcc..051668f2f 100644 --- a/clientapi/auth/login.go +++ b/clientapi/auth/login.go @@ -11,9 +11,9 @@ import ( "io" "net/http" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/setup/config" - uapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/setup/config" + uapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/clientapi/auth/login_application_service.go b/clientapi/auth/login_application_service.go index 44d61bd92..28291dcb3 100644 --- a/clientapi/auth/login_application_service.go +++ b/clientapi/auth/login_application_service.go @@ -9,10 +9,10 @@ package auth import ( "context" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/util" ) diff --git a/clientapi/auth/login_test.go b/clientapi/auth/login_test.go index 41cb500e2..f304a09e3 100644 --- a/clientapi/auth/login_test.go +++ b/clientapi/auth/login_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - "github.com/matrix-org/dendrite/clientapi/userutil" - "github.com/matrix-org/dendrite/setup/config" - uapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/userutil" + "github.com/element-hq/dendrite/setup/config" + uapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/auth/login_token.go b/clientapi/auth/login_token.go index 7e18662ac..7b2e79c4c 100644 --- a/clientapi/auth/login_token.go +++ b/clientapi/auth/login_token.go @@ -10,10 +10,10 @@ import ( "context" "net/http" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/setup/config" - uapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/setup/config" + uapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/clientapi/auth/password.go b/clientapi/auth/password.go index 7d94244ee..b7960a50d 100644 --- a/clientapi/auth/password.go +++ b/clientapi/auth/password.go @@ -11,11 +11,11 @@ import ( "net/http" "strings" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/clientapi/userutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/clientapi/userutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/clientapi/auth/user_interactive.go b/clientapi/auth/user_interactive.go index e80c32bfe..44d213b7d 100644 --- a/clientapi/auth/user_interactive.go +++ b/clientapi/auth/user_interactive.go @@ -12,8 +12,8 @@ import ( "net/http" "sync" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" "github.com/sirupsen/logrus" diff --git a/clientapi/auth/user_interactive_test.go b/clientapi/auth/user_interactive_test.go index 4003e9647..bdafd0453 100644 --- a/clientapi/auth/user_interactive_test.go +++ b/clientapi/auth/user_interactive_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/clientapi.go b/clientapi/clientapi.go index cbbe7c1b3..54c53d402 100644 --- a/clientapi/clientapi.go +++ b/clientapi/clientapi.go @@ -7,20 +7,20 @@ package clientapi import ( - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/process" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/process" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/fclient" - appserviceAPI "github.com/matrix-org/dendrite/appservice/api" - "github.com/matrix-org/dendrite/clientapi/api" - "github.com/matrix-org/dendrite/clientapi/producers" - "github.com/matrix-org/dendrite/clientapi/routing" - federationAPI "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/internal/transactions" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/jetstream" + appserviceAPI "github.com/element-hq/dendrite/appservice/api" + "github.com/element-hq/dendrite/clientapi/api" + "github.com/element-hq/dendrite/clientapi/producers" + "github.com/element-hq/dendrite/clientapi/routing" + federationAPI "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/internal/transactions" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/jetstream" ) // AddPublicRoutes sets up and registers HTTP handlers for the ClientAPI component. diff --git a/clientapi/clientapi_test.go b/clientapi/clientapi_test.go index c550b2083..ad2d4ad48 100644 --- a/clientapi/clientapi_test.go +++ b/clientapi/clientapi_test.go @@ -13,25 +13,25 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/appservice" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/clientapi/routing" - "github.com/matrix-org/dendrite/clientapi/threepid" - "github.com/matrix-org/dendrite/federationapi/statistics" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/pushrules" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/version" - "github.com/matrix-org/dendrite/setup/base" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" - "github.com/matrix-org/dendrite/userapi" - uapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/appservice" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/clientapi/routing" + "github.com/element-hq/dendrite/clientapi/threepid" + "github.com/element-hq/dendrite/federationapi/statistics" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/pushrules" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/version" + "github.com/element-hq/dendrite/setup/base" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" + "github.com/element-hq/dendrite/userapi" + uapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrix" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/clientapi/producers/syncapi.go b/clientapi/producers/syncapi.go index 82b6b6bee..9451e5b22 100644 --- a/clientapi/producers/syncapi.go +++ b/clientapi/producers/syncapi.go @@ -18,9 +18,9 @@ import ( "github.com/nats-io/nats.go" log "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/syncapi/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/syncapi/types" + userapi "github.com/element-hq/dendrite/userapi/api" ) // SyncAPIProducer produces events for the sync API server to consume diff --git a/clientapi/routing/account_data.go b/clientapi/routing/account_data.go index 9cdb8c184..d222187a5 100644 --- a/clientapi/routing/account_data.go +++ b/clientapi/routing/account_data.go @@ -12,11 +12,11 @@ import ( "io" "net/http" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/clientapi/producers" - "github.com/matrix-org/dendrite/internal/eventutil" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/clientapi/producers" + "github.com/element-hq/dendrite/internal/eventutil" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/admin.go b/clientapi/routing/admin.go index 73a0afc32..2c8f31608 100644 --- a/clientapi/routing/admin.go +++ b/clientapi/routing/admin.go @@ -11,8 +11,8 @@ import ( "time" "github.com/gorilla/mux" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/eventutil" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" @@ -20,13 +20,13 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/exp/constraints" - clientapi "github.com/matrix-org/dendrite/clientapi/api" - "github.com/matrix-org/dendrite/internal/httputil" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/userapi/api" - userapi "github.com/matrix-org/dendrite/userapi/api" + clientapi "github.com/element-hq/dendrite/clientapi/api" + "github.com/element-hq/dendrite/internal/httputil" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/userapi/api" + userapi "github.com/element-hq/dendrite/userapi/api" ) var validRegistrationTokenRegex = regexp.MustCompile("^[[:ascii:][:digit:]_]*$") diff --git a/clientapi/routing/admin_whois.go b/clientapi/routing/admin_whois.go index 2ca26fb90..20e0f5d72 100644 --- a/clientapi/routing/admin_whois.go +++ b/clientapi/routing/admin_whois.go @@ -9,7 +9,7 @@ package routing import ( "net/http" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/aliases.go b/clientapi/routing/aliases.go index be9284fe0..808bb5598 100644 --- a/clientapi/routing/aliases.go +++ b/clientapi/routing/aliases.go @@ -11,8 +11,8 @@ import ( "fmt" "net/http" - "github.com/matrix-org/dendrite/roomserver/api" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/roomserver/api" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/auth_fallback.go b/clientapi/routing/auth_fallback.go index 37e431057..e43a3d85f 100644 --- a/clientapi/routing/auth_fallback.go +++ b/clientapi/routing/auth_fallback.go @@ -11,8 +11,8 @@ import ( "html/template" "net/http" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/util" ) diff --git a/clientapi/routing/auth_fallback_test.go b/clientapi/routing/auth_fallback_test.go index afeca051b..f2ae81689 100644 --- a/clientapi/routing/auth_fallback_test.go +++ b/clientapi/routing/auth_fallback_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/setup/config" ) func Test_AuthFallback(t *testing.T) { diff --git a/clientapi/routing/capabilities.go b/clientapi/routing/capabilities.go index d037fd006..aef41d317 100644 --- a/clientapi/routing/capabilities.go +++ b/clientapi/routing/capabilities.go @@ -9,8 +9,8 @@ package routing import ( "net/http" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/version" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/version" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" ) diff --git a/clientapi/routing/createroom.go b/clientapi/routing/createroom.go index d41f44114..a1d3c3831 100644 --- a/clientapi/routing/createroom.go +++ b/clientapi/routing/createroom.go @@ -14,14 +14,14 @@ import ( "strings" "time" - appserviceAPI "github.com/matrix-org/dendrite/appservice/api" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - roomserverVersion "github.com/matrix-org/dendrite/roomserver/version" - "github.com/matrix-org/dendrite/userapi/api" + appserviceAPI "github.com/element-hq/dendrite/appservice/api" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + roomserverVersion "github.com/element-hq/dendrite/roomserver/version" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" log "github.com/sirupsen/logrus" diff --git a/clientapi/routing/deactivate.go b/clientapi/routing/deactivate.go index c151c130a..6b408506c 100644 --- a/clientapi/routing/deactivate.go +++ b/clientapi/routing/deactivate.go @@ -4,8 +4,8 @@ import ( "io" "net/http" - "github.com/matrix-org/dendrite/clientapi/auth" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/auth" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/device.go b/clientapi/routing/device.go index 4322305cd..6383b621d 100644 --- a/clientapi/routing/device.go +++ b/clientapi/routing/device.go @@ -12,9 +12,9 @@ import ( "net" "net/http" - "github.com/matrix-org/dendrite/clientapi/auth" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/auth" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/directory.go b/clientapi/routing/directory.go index 97ce95b1c..27bd8e9f6 100644 --- a/clientapi/routing/directory.go +++ b/clientapi/routing/directory.go @@ -15,11 +15,11 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/clientapi/httputil" - federationAPI "github.com/matrix-org/dendrite/federationapi/api" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/httputil" + federationAPI "github.com/element-hq/dendrite/federationapi/api" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" ) type roomDirectoryResponse struct { diff --git a/clientapi/routing/directory_public.go b/clientapi/routing/directory_public.go index faf1feff4..e6ec2642e 100644 --- a/clientapi/routing/directory_public.go +++ b/clientapi/routing/directory_public.go @@ -19,10 +19,10 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/clientapi/api" - "github.com/matrix-org/dendrite/clientapi/httputil" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/clientapi/api" + "github.com/element-hq/dendrite/clientapi/httputil" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" ) var ( diff --git a/clientapi/routing/joined_rooms.go b/clientapi/routing/joined_rooms.go index 531c1b7af..030766d37 100644 --- a/clientapi/routing/joined_rooms.go +++ b/clientapi/routing/joined_rooms.go @@ -11,8 +11,8 @@ import ( "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/roomserver/api" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/roomserver/api" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/clientapi/routing/joinroom.go b/clientapi/routing/joinroom.go index a4714825b..ffa05b654 100644 --- a/clientapi/routing/joinroom.go +++ b/clientapi/routing/joinroom.go @@ -11,11 +11,11 @@ import ( "net/http" "time" - appserviceAPI "github.com/matrix-org/dendrite/appservice/api" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/internal/eventutil" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/userapi/api" + appserviceAPI "github.com/element-hq/dendrite/appservice/api" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/internal/eventutil" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrix" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/joinroom_test.go b/clientapi/routing/joinroom_test.go index bd854efa8..9e2dd0c5a 100644 --- a/clientapi/routing/joinroom_test.go +++ b/clientapi/routing/joinroom_test.go @@ -7,19 +7,19 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/federationapi/statistics" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/federationapi/statistics" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/jetstream" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/appservice" - "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" - "github.com/matrix-org/dendrite/userapi" - uapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/appservice" + "github.com/element-hq/dendrite/roomserver" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" + "github.com/element-hq/dendrite/userapi" + uapi "github.com/element-hq/dendrite/userapi/api" ) var testIsBlacklistedOrBackingOff = func(s spec.ServerName) (*statistics.ServerStatistics, error) { diff --git a/clientapi/routing/key_backup.go b/clientapi/routing/key_backup.go index b7602eac3..c2460d4ae 100644 --- a/clientapi/routing/key_backup.go +++ b/clientapi/routing/key_backup.go @@ -11,8 +11,8 @@ import ( "fmt" "net/http" - "github.com/matrix-org/dendrite/clientapi/httputil" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/httputil" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/clientapi/routing/key_crosssigning.go b/clientapi/routing/key_crosssigning.go index 982e199e5..69d8a3d9d 100644 --- a/clientapi/routing/key_crosssigning.go +++ b/clientapi/routing/key_crosssigning.go @@ -9,11 +9,11 @@ package routing import ( "net/http" - "github.com/matrix-org/dendrite/clientapi/auth" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/auth" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/clientapi/routing/keys.go b/clientapi/routing/keys.go index a6d0b639b..11e901ded 100644 --- a/clientapi/routing/keys.go +++ b/clientapi/routing/keys.go @@ -13,8 +13,8 @@ import ( "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/clientapi/routing/leaveroom.go b/clientapi/routing/leaveroom.go index 674944c9f..b39814ba9 100644 --- a/clientapi/routing/leaveroom.go +++ b/clientapi/routing/leaveroom.go @@ -9,8 +9,8 @@ package routing import ( "net/http" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/userapi/api" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/clientapi/routing/login.go b/clientapi/routing/login.go index ca8ace55c..8e4dfc5bd 100644 --- a/clientapi/routing/login.go +++ b/clientapi/routing/login.go @@ -10,11 +10,11 @@ import ( "context" "net/http" - "github.com/matrix-org/dendrite/clientapi/auth" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/clientapi/userutil" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/auth" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/clientapi/userutil" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/clientapi/routing/login_test.go b/clientapi/routing/login_test.go index 3f8934490..b987e6f23 100644 --- a/clientapi/routing/login_test.go +++ b/clientapi/routing/login_test.go @@ -9,21 +9,21 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" - "github.com/matrix-org/dendrite/userapi" - uapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" + "github.com/element-hq/dendrite/userapi" + uapi "github.com/element-hq/dendrite/userapi/api" ) func TestLogin(t *testing.T) { diff --git a/clientapi/routing/logout.go b/clientapi/routing/logout.go index 997660963..a29d9d8f0 100644 --- a/clientapi/routing/logout.go +++ b/clientapi/routing/logout.go @@ -9,7 +9,7 @@ package routing import ( "net/http" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/clientapi/routing/membership.go b/clientapi/routing/membership.go index d37bb1ad1..a46f6d6b9 100644 --- a/clientapi/routing/membership.go +++ b/clientapi/routing/membership.go @@ -14,16 +14,16 @@ import ( "time" "github.com/getsentry/sentry-go" - appserviceAPI "github.com/matrix-org/dendrite/appservice/api" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/clientapi/threepid" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/roomserver/api" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + appserviceAPI "github.com/element-hq/dendrite/appservice/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/clientapi/threepid" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/roomserver/api" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/clientapi/routing/memberships.go b/clientapi/routing/memberships.go index fca712c8b..90ca86e35 100644 --- a/clientapi/routing/memberships.go +++ b/clientapi/routing/memberships.go @@ -10,8 +10,8 @@ import ( "encoding/json" "net/http" - "github.com/matrix-org/dendrite/roomserver/api" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/roomserver/api" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/clientapi/routing/notification.go b/clientapi/routing/notification.go index aa86f19c1..82b49920b 100644 --- a/clientapi/routing/notification.go +++ b/clientapi/routing/notification.go @@ -10,7 +10,7 @@ import ( "net/http" "strconv" - userapi "github.com/matrix-org/dendrite/userapi/api" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/openid.go b/clientapi/routing/openid.go index 45022b678..774cf0a82 100644 --- a/clientapi/routing/openid.go +++ b/clientapi/routing/openid.go @@ -9,8 +9,8 @@ package routing import ( "net/http" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/clientapi/routing/password.go b/clientapi/routing/password.go index 24c52b06d..59d9594d6 100644 --- a/clientapi/routing/password.go +++ b/clientapi/routing/password.go @@ -3,12 +3,12 @@ package routing import ( "net/http" - "github.com/matrix-org/dendrite/clientapi/auth" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/auth" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/peekroom.go b/clientapi/routing/peekroom.go index 5bdc9eba6..71232b358 100644 --- a/clientapi/routing/peekroom.go +++ b/clientapi/routing/peekroom.go @@ -9,8 +9,8 @@ import ( "encoding/json" "net/http" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/userapi/api" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrix" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/presence.go b/clientapi/routing/presence.go index 93c829363..bb2ae735a 100644 --- a/clientapi/routing/presence.go +++ b/clientapi/routing/presence.go @@ -12,12 +12,12 @@ import ( "strconv" "time" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/clientapi/producers" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/clientapi/producers" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" "github.com/nats-io/nats.go" diff --git a/clientapi/routing/profile.go b/clientapi/routing/profile.go index 3d95884e2..ab7708667 100644 --- a/clientapi/routing/profile.go +++ b/clientapi/routing/profile.go @@ -16,14 +16,14 @@ import ( "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" - appserviceAPI "github.com/matrix-org/dendrite/appservice/api" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + appserviceAPI "github.com/element-hq/dendrite/appservice/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrix" "github.com/matrix-org/util" ) diff --git a/clientapi/routing/pusher.go b/clientapi/routing/pusher.go index 6cb89e3e9..ea1b5f60b 100644 --- a/clientapi/routing/pusher.go +++ b/clientapi/routing/pusher.go @@ -10,8 +10,8 @@ import ( "net/http" "net/url" - "github.com/matrix-org/dendrite/clientapi/httputil" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/httputil" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/pushrules.go b/clientapi/routing/pushrules.go index 43c034f9d..8bc78e021 100644 --- a/clientapi/routing/pushrules.go +++ b/clientapi/routing/pushrules.go @@ -7,8 +7,8 @@ import ( "net/http" "reflect" - "github.com/matrix-org/dendrite/internal/pushrules" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/internal/pushrules" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/clientapi/routing/receipt.go b/clientapi/routing/receipt.go index df333b2ed..d03f43e7d 100644 --- a/clientapi/routing/receipt.go +++ b/clientapi/routing/receipt.go @@ -12,10 +12,10 @@ import ( "net/http" "time" - "github.com/matrix-org/dendrite/clientapi/producers" + "github.com/element-hq/dendrite/clientapi/producers" "github.com/matrix-org/gomatrixserverlib/spec" - userapi "github.com/matrix-org/dendrite/userapi/api" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/util" "github.com/sirupsen/logrus" ) diff --git a/clientapi/routing/redaction.go b/clientapi/routing/redaction.go index e41ac86c9..c354ef371 100644 --- a/clientapi/routing/redaction.go +++ b/clientapi/routing/redaction.go @@ -16,13 +16,13 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/internal/transactions" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/internal/transactions" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" ) type redactionContent struct { diff --git a/clientapi/routing/register.go b/clientapi/routing/register.go index 4ea3b4eba..63e310f70 100644 --- a/clientapi/routing/register.go +++ b/clientapi/routing/register.go @@ -22,11 +22,11 @@ import ( "sync" "time" - "github.com/matrix-org/dendrite/internal" + "github.com/element-hq/dendrite/internal" "github.com/tidwall/gjson" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" @@ -35,11 +35,11 @@ import ( "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/clientapi/auth" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/clientapi/userutil" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/auth" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/clientapi/userutil" + userapi "github.com/element-hq/dendrite/userapi/api" ) var ( diff --git a/clientapi/routing/register_secret.go b/clientapi/routing/register_secret.go index f384b604a..e5d6dbee6 100644 --- a/clientapi/routing/register_secret.go +++ b/clientapi/routing/register_secret.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/matrix-org/dendrite/internal" + "github.com/element-hq/dendrite/internal" "github.com/matrix-org/util" cache "github.com/patrickmn/go-cache" ) diff --git a/clientapi/routing/register_test.go b/clientapi/routing/register_test.go index 7b6474b77..2d793049d 100644 --- a/clientapi/routing/register_test.go +++ b/clientapi/routing/register_test.go @@ -19,17 +19,17 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" - "github.com/matrix-org/dendrite/userapi" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" + "github.com/element-hq/dendrite/userapi" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" "github.com/patrickmn/go-cache" diff --git a/clientapi/routing/report_event.go b/clientapi/routing/report_event.go index c088859dd..3e48edbb2 100644 --- a/clientapi/routing/report_event.go +++ b/clientapi/routing/report_event.go @@ -9,9 +9,9 @@ package routing import ( "net/http" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/roomserver/api" - userAPI "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/roomserver/api" + userAPI "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/clientapi/routing/room_hierarchy.go b/clientapi/routing/room_hierarchy.go index ae7ca3286..2eef53471 100644 --- a/clientapi/routing/room_hierarchy.go +++ b/clientapi/routing/room_hierarchy.go @@ -12,9 +12,9 @@ import ( "sync" "github.com/google/uuid" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/room_tagging.go b/clientapi/routing/room_tagging.go index f30bc3ba0..110f86d18 100644 --- a/clientapi/routing/room_tagging.go +++ b/clientapi/routing/room_tagging.go @@ -10,9 +10,9 @@ import ( "encoding/json" "net/http" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/clientapi/producers" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/clientapi/producers" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrix" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/routing.go b/clientapi/routing/routing.go index 600fb2792..f4a641b99 100644 --- a/clientapi/routing/routing.go +++ b/clientapi/routing/routing.go @@ -20,20 +20,20 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/sync/singleflight" - "github.com/matrix-org/dendrite/setup/base" - userapi "github.com/matrix-org/dendrite/userapi/api" - - appserviceAPI "github.com/matrix-org/dendrite/appservice/api" - "github.com/matrix-org/dendrite/clientapi/api" - "github.com/matrix-org/dendrite/clientapi/auth" - clientutil "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/clientapi/producers" - federationAPI "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/transactions" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/base" + userapi "github.com/element-hq/dendrite/userapi/api" + + appserviceAPI "github.com/element-hq/dendrite/appservice/api" + "github.com/element-hq/dendrite/clientapi/api" + "github.com/element-hq/dendrite/clientapi/auth" + clientutil "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/clientapi/producers" + federationAPI "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/transactions" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" ) type WellKnownClientHomeserver struct { diff --git a/clientapi/routing/sendevent.go b/clientapi/routing/sendevent.go index c71a3f4cf..00c6c0368 100644 --- a/clientapi/routing/sendevent.go +++ b/clientapi/routing/sendevent.go @@ -15,14 +15,14 @@ import ( "sync" "time" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/internal/transactions" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/synctypes" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/internal/transactions" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/synctypes" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/sendevent_test.go b/clientapi/routing/sendevent_test.go index 00d19154a..efa376437 100644 --- a/clientapi/routing/sendevent_test.go +++ b/clientapi/routing/sendevent_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - rsapi "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - uapi "github.com/matrix-org/dendrite/userapi/api" + rsapi "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + uapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/clientapi/routing/sendtodevice.go b/clientapi/routing/sendtodevice.go index 3b6a65f5d..8ff7b75c8 100644 --- a/clientapi/routing/sendtodevice.go +++ b/clientapi/routing/sendtodevice.go @@ -11,10 +11,10 @@ import ( "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/clientapi/producers" - "github.com/matrix-org/dendrite/internal/transactions" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/clientapi/producers" + "github.com/element-hq/dendrite/internal/transactions" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/clientapi/routing/sendtyping.go b/clientapi/routing/sendtyping.go index 09d9c048d..4f26f805c 100644 --- a/clientapi/routing/sendtyping.go +++ b/clientapi/routing/sendtyping.go @@ -10,10 +10,10 @@ import ( "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/clientapi/producers" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/clientapi/producers" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/clientapi/routing/server_notices.go b/clientapi/routing/server_notices.go index a8209a458..91e64c95b 100644 --- a/clientapi/routing/server_notices.go +++ b/clientapi/routing/server_notices.go @@ -19,15 +19,15 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/roomserver/types" - - appserviceAPI "github.com/matrix-org/dendrite/appservice/api" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/internal/transactions" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/roomserver/types" + + appserviceAPI "github.com/element-hq/dendrite/appservice/api" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/internal/transactions" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/clientapi/routing/state.go b/clientapi/routing/state.go index 6727972f1..21fa08477 100644 --- a/clientapi/routing/state.go +++ b/clientapi/routing/state.go @@ -12,10 +12,10 @@ import ( "fmt" "net/http" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/synctypes" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/synctypes" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/state_test.go b/clientapi/routing/state_test.go index 93b043723..c2ad23b05 100644 --- a/clientapi/routing/state_test.go +++ b/clientapi/routing/state_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - rsapi "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - uapi "github.com/matrix-org/dendrite/userapi/api" + rsapi "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + uapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/thirdparty.go b/clientapi/routing/thirdparty.go index a9406b851..20ce20568 100644 --- a/clientapi/routing/thirdparty.go +++ b/clientapi/routing/thirdparty.go @@ -12,8 +12,8 @@ import ( "github.com/matrix-org/util" - appserviceAPI "github.com/matrix-org/dendrite/appservice/api" - "github.com/matrix-org/dendrite/userapi/api" + appserviceAPI "github.com/element-hq/dendrite/appservice/api" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/clientapi/routing/threepid.go b/clientapi/routing/threepid.go index bd8667b50..2f429752a 100644 --- a/clientapi/routing/threepid.go +++ b/clientapi/routing/threepid.go @@ -9,12 +9,12 @@ package routing import ( "net/http" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/clientapi/threepid" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/userapi/api" - userdb "github.com/matrix-org/dendrite/userapi/storage" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/clientapi/threepid" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/userapi/api" + userdb "github.com/element-hq/dendrite/userapi/storage" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/clientapi/routing/upgrade_room.go b/clientapi/routing/upgrade_room.go index 49e4d06fe..51d611a9c 100644 --- a/clientapi/routing/upgrade_room.go +++ b/clientapi/routing/upgrade_room.go @@ -10,13 +10,13 @@ import ( "errors" "net/http" - appserviceAPI "github.com/matrix-org/dendrite/appservice/api" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/internal/eventutil" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/version" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + appserviceAPI "github.com/element-hq/dendrite/appservice/api" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/internal/eventutil" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/version" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/userdirectory.go b/clientapi/routing/userdirectory.go index 171b887ff..f7d56820e 100644 --- a/clientapi/routing/userdirectory.go +++ b/clientapi/routing/userdirectory.go @@ -13,9 +13,9 @@ import ( "net/http" "strings" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/roomserver/api" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/roomserver/api" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrix" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" diff --git a/clientapi/routing/voip.go b/clientapi/routing/voip.go index 641a4e20d..c603d2649 100644 --- a/clientapi/routing/voip.go +++ b/clientapi/routing/voip.go @@ -17,8 +17,8 @@ import ( "github.com/matrix-org/gomatrix" "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/clientapi/routing/whoami.go b/clientapi/routing/whoami.go index 80f58e879..57e702b63 100644 --- a/clientapi/routing/whoami.go +++ b/clientapi/routing/whoami.go @@ -8,7 +8,7 @@ package routing import ( "net/http" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/util" ) diff --git a/clientapi/threepid/invites.go b/clientapi/threepid/invites.go index 15edbbedf..6d875eef7 100644 --- a/clientapi/threepid/invites.go +++ b/clientapi/threepid/invites.go @@ -16,12 +16,12 @@ import ( "strings" "time" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/clientapi/threepid/threepid.go b/clientapi/threepid/threepid.go index 28a43e2e1..16ee9370d 100644 --- a/clientapi/threepid/threepid.go +++ b/clientapi/threepid/threepid.go @@ -16,7 +16,7 @@ import ( "strconv" "strings" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/clientapi/userutil/userutil.go b/clientapi/userutil/userutil.go index e271936a4..d931cd431 100644 --- a/clientapi/userutil/userutil.go +++ b/clientapi/userutil/userutil.go @@ -10,7 +10,7 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/clientapi/userutil/userutil_test.go b/clientapi/userutil/userutil_test.go index 743280ffe..757c9c1f7 100644 --- a/clientapi/userutil/userutil_test.go +++ b/clientapi/userutil/userutil_test.go @@ -8,7 +8,7 @@ package userutil import ( "testing" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/cmd/create-account/main.go b/cmd/create-account/main.go index 72b4b3f6d..4d9dcddf2 100644 --- a/cmd/create-account/main.go +++ b/cmd/create-account/main.go @@ -20,13 +20,13 @@ import ( "strings" "time" - "github.com/matrix-org/dendrite/internal" + "github.com/element-hq/dendrite/internal" "github.com/tidwall/gjson" "github.com/sirupsen/logrus" "golang.org/x/term" - "github.com/matrix-org/dendrite/setup" + "github.com/element-hq/dendrite/setup" ) const usage = `Usage: %s diff --git a/cmd/dendrite-demo-pinecone/conn/client.go b/cmd/dendrite-demo-pinecone/conn/client.go index f68868ce5..298e5881e 100644 --- a/cmd/dendrite-demo-pinecone/conn/client.go +++ b/cmd/dendrite-demo-pinecone/conn/client.go @@ -13,7 +13,7 @@ import ( "net/http" "strings" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/fclient" "nhooyr.io/websocket" diff --git a/cmd/dendrite-demo-pinecone/main.go b/cmd/dendrite-demo-pinecone/main.go index fdeaec813..e31d17e42 100644 --- a/cmd/dendrite-demo-pinecone/main.go +++ b/cmd/dendrite-demo-pinecone/main.go @@ -16,14 +16,14 @@ import ( "path/filepath" "strings" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/monolith" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/signing" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/monolith" + "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/signing" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/process" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/sirupsen/logrus" diff --git a/cmd/dendrite-demo-pinecone/monolith/keys.go b/cmd/dendrite-demo-pinecone/monolith/keys.go index 82c6dea30..ddd439ef9 100644 --- a/cmd/dendrite-demo-pinecone/monolith/keys.go +++ b/cmd/dendrite-demo-pinecone/monolith/keys.go @@ -10,8 +10,8 @@ import ( "crypto/ed25519" "os" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" ) func GetOrCreateKey(keyfile string, oldKeyfile string) (ed25519.PrivateKey, ed25519.PublicKey) { diff --git a/cmd/dendrite-demo-pinecone/monolith/monolith.go b/cmd/dendrite-demo-pinecone/monolith/monolith.go index 06303f0fd..26f2eab2a 100644 --- a/cmd/dendrite-demo-pinecone/monolith/monolith.go +++ b/cmd/dendrite-demo-pinecone/monolith/monolith.go @@ -20,29 +20,29 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/websocket" - "github.com/matrix-org/dendrite/appservice" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/conn" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/embed" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/relay" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/rooms" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/users" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/signing" - "github.com/matrix-org/dendrite/federationapi" - federationAPI "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/federationapi/producers" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/relayapi" - relayAPI "github.com/matrix-org/dendrite/relayapi/api" - "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/setup" - "github.com/matrix-org/dendrite/setup/base" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/userapi" - userAPI "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/appservice" + "github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/conn" + "github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/embed" + "github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/relay" + "github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/rooms" + "github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/users" + "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/signing" + "github.com/element-hq/dendrite/federationapi" + federationAPI "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/federationapi/producers" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/relayapi" + relayAPI "github.com/element-hq/dendrite/relayapi/api" + "github.com/element-hq/dendrite/roomserver" + "github.com/element-hq/dendrite/setup" + "github.com/element-hq/dendrite/setup/base" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/userapi" + userAPI "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/sirupsen/logrus" diff --git a/cmd/dendrite-demo-pinecone/relay/retriever.go b/cmd/dendrite-demo-pinecone/relay/retriever.go index 98fcf45df..49d95a68b 100644 --- a/cmd/dendrite-demo-pinecone/relay/retriever.go +++ b/cmd/dendrite-demo-pinecone/relay/retriever.go @@ -12,8 +12,8 @@ import ( "sync/atomic" "time" - federationAPI "github.com/matrix-org/dendrite/federationapi/api" - relayServerAPI "github.com/matrix-org/dendrite/relayapi/api" + federationAPI "github.com/element-hq/dendrite/federationapi/api" + relayServerAPI "github.com/element-hq/dendrite/relayapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/sirupsen/logrus" ) diff --git a/cmd/dendrite-demo-pinecone/relay/retriever_test.go b/cmd/dendrite-demo-pinecone/relay/retriever_test.go index 2a784792f..27d450386 100644 --- a/cmd/dendrite-demo-pinecone/relay/retriever_test.go +++ b/cmd/dendrite-demo-pinecone/relay/retriever_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - federationAPI "github.com/matrix-org/dendrite/federationapi/api" - relayServerAPI "github.com/matrix-org/dendrite/relayapi/api" + federationAPI "github.com/element-hq/dendrite/federationapi/api" + relayServerAPI "github.com/element-hq/dendrite/relayapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/cmd/dendrite-demo-pinecone/rooms/rooms.go b/cmd/dendrite-demo-pinecone/rooms/rooms.go index 60cc3c7fe..c594b5ae2 100644 --- a/cmd/dendrite-demo-pinecone/rooms/rooms.go +++ b/cmd/dendrite-demo-pinecone/rooms/rooms.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/defaults" - "github.com/matrix-org/dendrite/federationapi/api" + "github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/defaults" + "github.com/element-hq/dendrite/federationapi/api" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/cmd/dendrite-demo-pinecone/users/users.go b/cmd/dendrite-demo-pinecone/users/users.go index 261c08215..af62bfe53 100644 --- a/cmd/dendrite-demo-pinecone/users/users.go +++ b/cmd/dendrite-demo-pinecone/users/users.go @@ -15,10 +15,10 @@ import ( "sync" "time" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - clienthttputil "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/defaults" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + clienthttputil "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/defaults" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/cmd/dendrite-demo-yggdrasil/main.go b/cmd/dendrite-demo-yggdrasil/main.go index 55d3e68d7..617fdf071 100644 --- a/cmd/dendrite-demo-yggdrasil/main.go +++ b/cmd/dendrite-demo-yggdrasil/main.go @@ -20,30 +20,30 @@ import ( "time" "github.com/getsentry/sentry-go" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/gorilla/mux" - "github.com/matrix-org/dendrite/appservice" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/embed" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/signing" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/yggconn" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/yggrooms" - "github.com/matrix-org/dendrite/federationapi" - "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/setup" - basepkg "github.com/matrix-org/dendrite/setup/base" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/mscs" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/userapi" + "github.com/element-hq/dendrite/appservice" + "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/embed" + "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/signing" + "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/yggconn" + "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/yggrooms" + "github.com/element-hq/dendrite/federationapi" + "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/roomserver" + "github.com/element-hq/dendrite/setup" + basepkg "github.com/element-hq/dendrite/setup/base" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/mscs" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/userapi" "github.com/sirupsen/logrus" ) diff --git a/cmd/dendrite-demo-yggdrasil/yggconn/client.go b/cmd/dendrite-demo-yggdrasil/yggconn/client.go index e1dc0f668..54aedb44e 100644 --- a/cmd/dendrite-demo-yggdrasil/yggconn/client.go +++ b/cmd/dendrite-demo-yggdrasil/yggconn/client.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/fclient" ) diff --git a/cmd/dendrite-demo-yggdrasil/yggrooms/yggrooms.go b/cmd/dendrite-demo-yggdrasil/yggrooms/yggrooms.go index 386d60a2e..1a48744b7 100644 --- a/cmd/dendrite-demo-yggdrasil/yggrooms/yggrooms.go +++ b/cmd/dendrite-demo-yggdrasil/yggrooms/yggrooms.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/yggconn" - "github.com/matrix-org/dendrite/federationapi/api" + "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/yggconn" + "github.com/element-hq/dendrite/federationapi/api" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/cmd/dendrite-upgrade-tests/main.go b/cmd/dendrite-upgrade-tests/main.go index 871a605d4..8e1243550 100644 --- a/cmd/dendrite-upgrade-tests/main.go +++ b/cmd/dendrite-upgrade-tests/main.go @@ -141,7 +141,7 @@ const dendriteUpgradeTestLabel = "dendrite_upgrade_test" // downloadArchive downloads an arbitrary github archive of the form: // -// https://github.com/matrix-org/dendrite/archive/v0.3.11.tar.gz +// https://github.com/element-hq/dendrite/archive/v0.3.11.tar.gz // // and re-tarballs it without the top-level directory which contains branch information. It inserts // the contents of `dockerfile` as a root file `Dockerfile` in the re-tarballed directory such that @@ -210,7 +210,7 @@ func buildDendrite(httpClient *http.Client, dockerClient *client.Client, tmpDir log.Printf("%s: Downloading version %s to %s\n", branchOrTagName, branchOrTagName, tmpDir) // pull an archive, this contains a top-level directory which screws with the build context // which we need to fix up post download - u := fmt.Sprintf("https://github.com/matrix-org/dendrite/archive/%s.tar.gz", branchOrTagName) + u := fmt.Sprintf("https://github.com/element-hq/dendrite/archive/%s.tar.gz", branchOrTagName) tarball, err = downloadArchive(httpClient, tmpDir, u, dockerfile()) if err != nil { return "", fmt.Errorf("failed to download archive %s: %w", u, err) @@ -255,7 +255,7 @@ func buildDendrite(httpClient *http.Client, dockerClient *client.Client, tmpDir } func getAndSortVersionsFromGithub(httpClient *http.Client) (semVers []*semver.Version, err error) { - u := "https://api.github.com/repos/matrix-org/dendrite/tags" + u := "https://api.github.com/repos/element-hq/dendrite/tags" var res *http.Response for i := 0; i < 3; i++ { diff --git a/cmd/dendrite/main.go b/cmd/dendrite/main.go index f8b3dc530..504e90b70 100644 --- a/cmd/dendrite/main.go +++ b/cmd/dendrite/main.go @@ -11,24 +11,24 @@ import ( "time" "github.com/getsentry/sentry-go" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/appservice" - "github.com/matrix-org/dendrite/federationapi" - "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/setup" - basepkg "github.com/matrix-org/dendrite/setup/base" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/mscs" - "github.com/matrix-org/dendrite/userapi" + "github.com/element-hq/dendrite/appservice" + "github.com/element-hq/dendrite/federationapi" + "github.com/element-hq/dendrite/roomserver" + "github.com/element-hq/dendrite/setup" + basepkg "github.com/element-hq/dendrite/setup/base" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/mscs" + "github.com/element-hq/dendrite/userapi" ) var ( diff --git a/cmd/generate-config/main.go b/cmd/generate-config/main.go index 2379ce2bb..c6399ec50 100644 --- a/cmd/generate-config/main.go +++ b/cmd/generate-config/main.go @@ -8,7 +8,7 @@ import ( "golang.org/x/crypto/bcrypt" "gopkg.in/yaml.v2" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/cmd/generate-keys/main.go b/cmd/generate-keys/main.go index 973550f64..222faeaa6 100644 --- a/cmd/generate-keys/main.go +++ b/cmd/generate-keys/main.go @@ -12,7 +12,7 @@ import ( "log" "os" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/test" ) const usage = `Usage: %s diff --git a/cmd/resolve-state/main.go b/cmd/resolve-state/main.go index d6db72436..fd98c0d47 100644 --- a/cmd/resolve-state/main.go +++ b/cmd/resolve-state/main.go @@ -9,14 +9,14 @@ import ( "strings" "time" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/state" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/state" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/process" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/contrib/dendrite-demo-i2p/main.go b/contrib/dendrite-demo-i2p/main.go index 3f2bc8534..7ca1500e4 100644 --- a/contrib/dendrite-demo-i2p/main.go +++ b/contrib/dendrite-demo-i2p/main.go @@ -12,24 +12,24 @@ import ( "time" "github.com/getsentry/sentry-go" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/appservice" - "github.com/matrix-org/dendrite/federationapi" - "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/setup" - basepkg "github.com/matrix-org/dendrite/setup/base" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/mscs" - "github.com/matrix-org/dendrite/userapi" + "github.com/element-hq/dendrite/appservice" + "github.com/element-hq/dendrite/federationapi" + "github.com/element-hq/dendrite/roomserver" + "github.com/element-hq/dendrite/setup" + basepkg "github.com/element-hq/dendrite/setup/base" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/mscs" + "github.com/element-hq/dendrite/userapi" ) var ( diff --git a/contrib/dendrite-demo-i2p/main_i2p.go b/contrib/dendrite-demo-i2p/main_i2p.go index 47d70f008..f05601311 100644 --- a/contrib/dendrite-demo-i2p/main_i2p.go +++ b/contrib/dendrite-demo-i2p/main_i2p.go @@ -24,14 +24,14 @@ import ( sentryhttp "github.com/getsentry/sentry-go/http" "github.com/gorilla/mux" "github.com/kardianos/minwinsvc" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/setup/process" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" - basepkg "github.com/matrix-org/dendrite/setup/base" - "github.com/matrix-org/dendrite/setup/config" + basepkg "github.com/element-hq/dendrite/setup/base" + "github.com/element-hq/dendrite/setup/config" ) func client() (*goSam.Client, error) { diff --git a/contrib/dendrite-demo-tor/main.go b/contrib/dendrite-demo-tor/main.go index 0b20ad04a..8a078ba43 100644 --- a/contrib/dendrite-demo-tor/main.go +++ b/contrib/dendrite-demo-tor/main.go @@ -11,24 +11,24 @@ import ( "time" "github.com/getsentry/sentry-go" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/appservice" - "github.com/matrix-org/dendrite/federationapi" - "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/setup" - basepkg "github.com/matrix-org/dendrite/setup/base" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/mscs" - "github.com/matrix-org/dendrite/userapi" + "github.com/element-hq/dendrite/appservice" + "github.com/element-hq/dendrite/federationapi" + "github.com/element-hq/dendrite/roomserver" + "github.com/element-hq/dendrite/setup" + basepkg "github.com/element-hq/dendrite/setup/base" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/mscs" + "github.com/element-hq/dendrite/userapi" ) var _, skip = os.LookupEnv("CI") diff --git a/contrib/dendrite-demo-tor/main_tor.go b/contrib/dendrite-demo-tor/main_tor.go index 411868452..6df50cb01 100644 --- a/contrib/dendrite-demo-tor/main_tor.go +++ b/contrib/dendrite-demo-tor/main_tor.go @@ -22,14 +22,14 @@ import ( sentryhttp "github.com/getsentry/sentry-go/http" "github.com/gorilla/mux" "github.com/kardianos/minwinsvc" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/setup/process" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" - basepkg "github.com/matrix-org/dendrite/setup/base" - "github.com/matrix-org/dendrite/setup/config" + basepkg "github.com/element-hq/dendrite/setup/base" + "github.com/element-hq/dendrite/setup/config" ) func start() (*tor.Tor, error) { diff --git a/federationapi/api/api.go b/federationapi/api/api.go index efe0547df..0a4055436 100644 --- a/federationapi/api/api.go +++ b/federationapi/api/api.go @@ -10,8 +10,8 @@ import ( "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/federationapi/types" - rstypes "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/federationapi/types" + rstypes "github.com/element-hq/dendrite/roomserver/types" ) // FederationInternalAPI is used to query information from the federation sender. diff --git a/federationapi/consumers/keychange.go b/federationapi/consumers/keychange.go index 03c4eee36..e7623eafc 100644 --- a/federationapi/consumers/keychange.go +++ b/federationapi/consumers/keychange.go @@ -16,14 +16,14 @@ import ( "github.com/nats-io/nats.go" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/federationapi/queue" - "github.com/matrix-org/dendrite/federationapi/storage" - "github.com/matrix-org/dendrite/federationapi/types" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/federationapi/queue" + "github.com/element-hq/dendrite/federationapi/storage" + "github.com/element-hq/dendrite/federationapi/types" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/userapi/api" ) // KeyChangeConsumer consumes events that originate in key server. diff --git a/federationapi/consumers/presence.go b/federationapi/consumers/presence.go index 06077d31e..964b111c1 100644 --- a/federationapi/consumers/presence.go +++ b/federationapi/consumers/presence.go @@ -11,14 +11,14 @@ import ( "encoding/json" "strconv" - "github.com/matrix-org/dendrite/federationapi/queue" - "github.com/matrix-org/dendrite/federationapi/storage" - fedTypes "github.com/matrix-org/dendrite/federationapi/types" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/federationapi/queue" + "github.com/element-hq/dendrite/federationapi/storage" + fedTypes "github.com/element-hq/dendrite/federationapi/types" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/federationapi/consumers/receipts.go b/federationapi/consumers/receipts.go index 99f463717..83cfa0dd4 100644 --- a/federationapi/consumers/receipts.go +++ b/federationapi/consumers/receipts.go @@ -12,13 +12,13 @@ import ( "strconv" "github.com/getsentry/sentry-go" - "github.com/matrix-org/dendrite/federationapi/queue" - "github.com/matrix-org/dendrite/federationapi/storage" - fedTypes "github.com/matrix-org/dendrite/federationapi/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - syncTypes "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/federationapi/queue" + "github.com/element-hq/dendrite/federationapi/storage" + fedTypes "github.com/element-hq/dendrite/federationapi/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + syncTypes "github.com/element-hq/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/nats-io/nats.go" diff --git a/federationapi/consumers/roomserver.go b/federationapi/consumers/roomserver.go index 90945a55f..9935f662c 100644 --- a/federationapi/consumers/roomserver.go +++ b/federationapi/consumers/roomserver.go @@ -15,7 +15,7 @@ import ( "strconv" "time" - syncAPITypes "github.com/matrix-org/dendrite/syncapi/types" + syncAPITypes "github.com/element-hq/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/gomatrixserverlib" @@ -23,13 +23,13 @@ import ( "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/federationapi/queue" - "github.com/matrix-org/dendrite/federationapi/storage" - "github.com/matrix-org/dendrite/federationapi/types" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/federationapi/queue" + "github.com/element-hq/dendrite/federationapi/storage" + "github.com/element-hq/dendrite/federationapi/types" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" ) // OutputRoomEventConsumer consumes events that originated in the room server. diff --git a/federationapi/consumers/sendtodevice.go b/federationapi/consumers/sendtodevice.go index 0c0a99c24..3e018fc7d 100644 --- a/federationapi/consumers/sendtodevice.go +++ b/federationapi/consumers/sendtodevice.go @@ -17,12 +17,12 @@ import ( "github.com/nats-io/nats.go" log "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/federationapi/queue" - "github.com/matrix-org/dendrite/federationapi/storage" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - syncTypes "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/federationapi/queue" + "github.com/element-hq/dendrite/federationapi/storage" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + syncTypes "github.com/element-hq/dendrite/syncapi/types" ) // OutputSendToDeviceConsumer consumes events that originate in the clientapi. diff --git a/federationapi/consumers/typing.go b/federationapi/consumers/typing.go index dbe2d1ec4..94ff165d5 100644 --- a/federationapi/consumers/typing.go +++ b/federationapi/consumers/typing.go @@ -11,11 +11,11 @@ import ( "encoding/json" "strconv" - "github.com/matrix-org/dendrite/federationapi/queue" - "github.com/matrix-org/dendrite/federationapi/storage" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/federationapi/queue" + "github.com/element-hq/dendrite/federationapi/storage" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/nats-io/nats.go" diff --git a/federationapi/federationapi.go b/federationapi/federationapi.go index e30802b31..88b9bc179 100644 --- a/federationapi/federationapi.go +++ b/federationapi/federationapi.go @@ -9,28 +9,28 @@ package federationapi import ( "time" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/process" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/sirupsen/logrus" - federationAPI "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/federationapi/consumers" - "github.com/matrix-org/dendrite/federationapi/internal" - "github.com/matrix-org/dendrite/federationapi/producers" - "github.com/matrix-org/dendrite/federationapi/queue" - "github.com/matrix-org/dendrite/federationapi/statistics" - "github.com/matrix-org/dendrite/federationapi/storage" - "github.com/matrix-org/dendrite/internal/caching" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/jetstream" - userapi "github.com/matrix-org/dendrite/userapi/api" + federationAPI "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/federationapi/consumers" + "github.com/element-hq/dendrite/federationapi/internal" + "github.com/element-hq/dendrite/federationapi/producers" + "github.com/element-hq/dendrite/federationapi/queue" + "github.com/element-hq/dendrite/federationapi/statistics" + "github.com/element-hq/dendrite/federationapi/storage" + "github.com/element-hq/dendrite/internal/caching" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/jetstream" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" - "github.com/matrix-org/dendrite/federationapi/routing" + "github.com/element-hq/dendrite/federationapi/routing" ) // AddPublicRoutes sets up and registers HTTP handlers on the base API muxes for the FederationAPI component. diff --git a/federationapi/federationapi_keys_test.go b/federationapi/federationapi_keys_test.go index 9dda389ed..4d5b2b68f 100644 --- a/federationapi/federationapi_keys_test.go +++ b/federationapi/federationapi_keys_test.go @@ -12,17 +12,17 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/federationapi/routing" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/federationapi/routing" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/setup/config" ) type server struct { diff --git a/federationapi/federationapi_test.go b/federationapi/federationapi_test.go index 79f4b3f21..3d4faad59 100644 --- a/federationapi/federationapi_test.go +++ b/federationapi/federationapi_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/federationapi/routing" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/federationapi/routing" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrix" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" @@ -25,15 +25,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/tidwall/gjson" - "github.com/matrix-org/dendrite/federationapi" - "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/federationapi/internal" - rsapi "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/federationapi" + "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/federationapi/internal" + rsapi "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" + userapi "github.com/element-hq/dendrite/userapi/api" ) type fedRoomserverAPI struct { diff --git a/federationapi/internal/api.go b/federationapi/internal/api.go index 67388a102..809cf2046 100644 --- a/federationapi/internal/api.go +++ b/federationapi/internal/api.go @@ -7,14 +7,14 @@ import ( "sync" "time" - "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/federationapi/queue" - "github.com/matrix-org/dendrite/federationapi/statistics" - "github.com/matrix-org/dendrite/federationapi/storage" - "github.com/matrix-org/dendrite/federationapi/storage/cache" - "github.com/matrix-org/dendrite/internal/caching" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/federationapi/queue" + "github.com/element-hq/dendrite/federationapi/statistics" + "github.com/element-hq/dendrite/federationapi/storage" + "github.com/element-hq/dendrite/federationapi/storage/cache" + "github.com/element-hq/dendrite/internal/caching" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrix" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" diff --git a/federationapi/internal/federationclient_test.go b/federationapi/internal/federationclient_test.go index 57d15dd5c..d3e8f172e 100644 --- a/federationapi/internal/federationclient_test.go +++ b/federationapi/internal/federationclient_test.go @@ -11,11 +11,11 @@ import ( "fmt" "testing" - "github.com/matrix-org/dendrite/federationapi/queue" - "github.com/matrix-org/dendrite/federationapi/statistics" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/federationapi/queue" + "github.com/element-hq/dendrite/federationapi/statistics" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/stretchr/testify/assert" diff --git a/federationapi/internal/perform.go b/federationapi/internal/perform.go index 0200cf69b..8797d5d18 100644 --- a/federationapi/internal/perform.go +++ b/federationapi/internal/perform.go @@ -15,12 +15,12 @@ import ( "github.com/matrix-org/util" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/federationapi/consumers" - "github.com/matrix-org/dendrite/federationapi/statistics" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/roomserver/version" + "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/federationapi/consumers" + "github.com/element-hq/dendrite/federationapi/statistics" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/version" ) // PerformLeaveRequest implements api.FederationInternalAPI diff --git a/federationapi/internal/perform_test.go b/federationapi/internal/perform_test.go index 7a1d45b46..b5c278b3d 100644 --- a/federationapi/internal/perform_test.go +++ b/federationapi/internal/perform_test.go @@ -11,12 +11,12 @@ import ( "crypto/ed25519" "testing" - "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/federationapi/queue" - "github.com/matrix-org/dendrite/federationapi/statistics" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/federationapi/queue" + "github.com/element-hq/dendrite/federationapi/statistics" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/stretchr/testify/assert" diff --git a/federationapi/internal/query.go b/federationapi/internal/query.go index 21e77c48d..22b1eb44d 100644 --- a/federationapi/internal/query.go +++ b/federationapi/internal/query.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/matrix-org/dendrite/federationapi/api" + "github.com/element-hq/dendrite/federationapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/federationapi/producers/syncapi.go b/federationapi/producers/syncapi.go index 154480477..08e67697c 100644 --- a/federationapi/producers/syncapi.go +++ b/federationapi/producers/syncapi.go @@ -18,10 +18,10 @@ import ( "github.com/nats-io/nats.go" log "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/syncapi/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/syncapi/types" + userapi "github.com/element-hq/dendrite/userapi/api" ) // SyncAPIProducer produces events for the sync API server to consume diff --git a/federationapi/queue/destinationqueue.go b/federationapi/queue/destinationqueue.go index aff9c87c3..9e069a6a4 100644 --- a/federationapi/queue/destinationqueue.go +++ b/federationapi/queue/destinationqueue.go @@ -20,11 +20,11 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/federationapi/statistics" - "github.com/matrix-org/dendrite/federationapi/storage" - "github.com/matrix-org/dendrite/federationapi/storage/shared/receipt" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/federationapi/statistics" + "github.com/element-hq/dendrite/federationapi/storage" + "github.com/element-hq/dendrite/federationapi/storage/shared/receipt" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/process" ) const ( diff --git a/federationapi/queue/queue.go b/federationapi/queue/queue.go index 99273bbf8..a23645863 100644 --- a/federationapi/queue/queue.go +++ b/federationapi/queue/queue.go @@ -20,11 +20,11 @@ import ( "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/federationapi/statistics" - "github.com/matrix-org/dendrite/federationapi/storage" - "github.com/matrix-org/dendrite/federationapi/storage/shared/receipt" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/federationapi/statistics" + "github.com/element-hq/dendrite/federationapi/storage" + "github.com/element-hq/dendrite/federationapi/storage/shared/receipt" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/process" ) // OutgoingQueues is a collection of queues for sending transactions to other diff --git a/federationapi/queue/queue_test.go b/federationapi/queue/queue_test.go index 80dbe3b54..54be03176 100644 --- a/federationapi/queue/queue_test.go +++ b/federationapi/queue/queue_test.go @@ -14,9 +14,9 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/test/testrig" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/test/testrig" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" "gotest.tools/v3/poll" @@ -24,12 +24,12 @@ import ( "github.com/matrix-org/gomatrixserverlib" "github.com/stretchr/testify/assert" - "github.com/matrix-org/dendrite/federationapi/statistics" - "github.com/matrix-org/dendrite/federationapi/storage" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/federationapi/statistics" + "github.com/element-hq/dendrite/federationapi/storage" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/test" ) func mustCreateFederationDatabase(t *testing.T, dbType test.DBType, realDatabase bool) (storage.Database, *process.ProcessContext, func()) { diff --git a/federationapi/routing/backfill.go b/federationapi/routing/backfill.go index f5d70ae68..ae6524b0c 100644 --- a/federationapi/routing/backfill.go +++ b/federationapi/routing/backfill.go @@ -12,9 +12,9 @@ import ( "strconv" "time" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/federationapi/routing/devices.go b/federationapi/routing/devices.go index ec1c4253f..4473d8c4a 100644 --- a/federationapi/routing/devices.go +++ b/federationapi/routing/devices.go @@ -9,7 +9,7 @@ import ( "encoding/json" "net/http" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/federationapi/routing/eventauth.go b/federationapi/routing/eventauth.go index df81b53e2..2a7fe5e3c 100644 --- a/federationapi/routing/eventauth.go +++ b/federationapi/routing/eventauth.go @@ -9,8 +9,8 @@ import ( "context" "net/http" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/federationapi/routing/events.go b/federationapi/routing/events.go index 2b3d2ddba..b416384af 100644 --- a/federationapi/routing/events.go +++ b/federationapi/routing/events.go @@ -11,7 +11,7 @@ import ( "net/http" "time" - "github.com/matrix-org/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/federationapi/routing/invite.go b/federationapi/routing/invite.go index f668fd778..d35e8ac05 100644 --- a/federationapi/routing/invite.go +++ b/federationapi/routing/invite.go @@ -13,9 +13,9 @@ import ( "fmt" "net/http" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/federationapi/routing/join.go b/federationapi/routing/join.go index 6ab22ad48..fc1555cd2 100644 --- a/federationapi/routing/join.go +++ b/federationapi/routing/join.go @@ -18,10 +18,10 @@ import ( "github.com/matrix-org/util" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" ) // MakeJoin implements the /make_join API diff --git a/federationapi/routing/keys.go b/federationapi/routing/keys.go index edd9038e5..36a18e900 100644 --- a/federationapi/routing/keys.go +++ b/federationapi/routing/keys.go @@ -11,10 +11,10 @@ import ( "net/http" "time" - clienthttputil "github.com/matrix-org/dendrite/clientapi/httputil" - federationAPI "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/userapi/api" + clienthttputil "github.com/element-hq/dendrite/clientapi/httputil" + federationAPI "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/federationapi/routing/leave.go b/federationapi/routing/leave.go index 76a5564bb..679c23064 100644 --- a/federationapi/routing/leave.go +++ b/federationapi/routing/leave.go @@ -10,10 +10,10 @@ import ( "net/http" "time" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/federationapi/routing/missingevents.go b/federationapi/routing/missingevents.go index aa4fa0f3d..b92941d01 100644 --- a/federationapi/routing/missingevents.go +++ b/federationapi/routing/missingevents.go @@ -9,8 +9,8 @@ import ( "encoding/json" "net/http" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/federationapi/routing/openid.go b/federationapi/routing/openid.go index e70676d6f..1cd8fd37b 100644 --- a/federationapi/routing/openid.go +++ b/federationapi/routing/openid.go @@ -10,7 +10,7 @@ import ( "net/http" "time" - userapi "github.com/matrix-org/dendrite/userapi/api" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/federationapi/routing/peek.go b/federationapi/routing/peek.go index 8c7d87b8e..214f5c5a3 100644 --- a/federationapi/routing/peek.go +++ b/federationapi/routing/peek.go @@ -8,9 +8,9 @@ package routing import ( "net/http" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/federationapi/routing/profile.go b/federationapi/routing/profile.go index 81f97caf3..ca2e682be 100644 --- a/federationapi/routing/profile.go +++ b/federationapi/routing/profile.go @@ -10,10 +10,10 @@ import ( "fmt" "net/http" - appserviceAPI "github.com/matrix-org/dendrite/appservice/api" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + appserviceAPI "github.com/element-hq/dendrite/appservice/api" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/federationapi/routing/profile_test.go b/federationapi/routing/profile_test.go index ac42602cc..df8b24703 100644 --- a/federationapi/routing/profile_test.go +++ b/federationapi/routing/profile_test.go @@ -15,17 +15,17 @@ import ( "testing" "github.com/gorilla/mux" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/signing" - fedAPI "github.com/matrix-org/dendrite/federationapi" - "github.com/matrix-org/dendrite/federationapi/routing" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" - userAPI "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/signing" + fedAPI "github.com/element-hq/dendrite/federationapi" + "github.com/element-hq/dendrite/federationapi/routing" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" + userAPI "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/federationapi/routing/publicrooms.go b/federationapi/routing/publicrooms.go index 213d1631a..ed204be15 100644 --- a/federationapi/routing/publicrooms.go +++ b/federationapi/routing/publicrooms.go @@ -11,8 +11,8 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/clientapi/httputil" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" + "github.com/element-hq/dendrite/clientapi/httputil" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" ) type PublicRoomReq struct { diff --git a/federationapi/routing/query.go b/federationapi/routing/query.go index c86e944fc..c528d6b6b 100644 --- a/federationapi/routing/query.go +++ b/federationapi/routing/query.go @@ -9,10 +9,10 @@ import ( "fmt" "net/http" - federationAPI "github.com/matrix-org/dendrite/federationapi/api" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" + federationAPI "github.com/element-hq/dendrite/federationapi/api" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrix" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" diff --git a/federationapi/routing/query_test.go b/federationapi/routing/query_test.go index a7b401719..8124bb33e 100644 --- a/federationapi/routing/query_test.go +++ b/federationapi/routing/query_test.go @@ -15,15 +15,15 @@ import ( "testing" "github.com/gorilla/mux" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/signing" - fedAPI "github.com/matrix-org/dendrite/federationapi" - "github.com/matrix-org/dendrite/federationapi/routing" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" + "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/signing" + fedAPI "github.com/element-hq/dendrite/federationapi" + "github.com/element-hq/dendrite/federationapi/routing" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/federationapi/routing/routing.go b/federationapi/routing/routing.go index cfab63b47..9481f095f 100644 --- a/federationapi/routing/routing.go +++ b/federationapi/routing/routing.go @@ -16,14 +16,14 @@ import ( "github.com/getsentry/sentry-go" "github.com/gorilla/mux" - fedInternal "github.com/matrix-org/dendrite/federationapi/internal" - "github.com/matrix-org/dendrite/federationapi/producers" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/roomserver/api" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + fedInternal "github.com/element-hq/dendrite/federationapi/internal" + "github.com/element-hq/dendrite/federationapi/producers" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/roomserver/api" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/federationapi/routing/send.go b/federationapi/routing/send.go index 63c1cf3dd..4bd2db002 100644 --- a/federationapi/routing/send.go +++ b/federationapi/routing/send.go @@ -17,11 +17,11 @@ import ( "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/federationapi/producers" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - userAPI "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/federationapi/producers" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + userAPI "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/routing/send_test.go b/federationapi/routing/send_test.go index b092746db..8e71753a9 100644 --- a/federationapi/routing/send_test.go +++ b/federationapi/routing/send_test.go @@ -13,15 +13,15 @@ import ( "testing" "github.com/gorilla/mux" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/signing" - fedAPI "github.com/matrix-org/dendrite/federationapi" - "github.com/matrix-org/dendrite/federationapi/routing" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" + "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/signing" + fedAPI "github.com/element-hq/dendrite/federationapi" + "github.com/element-hq/dendrite/federationapi/routing" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/federationapi/routing/state.go b/federationapi/routing/state.go index d24df0923..5d9cef9b1 100644 --- a/federationapi/routing/state.go +++ b/federationapi/routing/state.go @@ -10,8 +10,8 @@ import ( "net/http" "net/url" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/federationapi/routing/threepid.go b/federationapi/routing/threepid.go index f614a0a6b..269c9a7be 100644 --- a/federationapi/routing/threepid.go +++ b/federationapi/routing/threepid.go @@ -13,11 +13,11 @@ import ( "net/http" "time" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/federationapi/routing/version.go b/federationapi/routing/version.go index a96610d4e..e6857697d 100644 --- a/federationapi/routing/version.go +++ b/federationapi/routing/version.go @@ -8,7 +8,7 @@ package routing import ( "net/http" - "github.com/matrix-org/dendrite/internal" + "github.com/element-hq/dendrite/internal" "github.com/matrix-org/util" ) diff --git a/federationapi/statistics/statistics.go b/federationapi/statistics/statistics.go index 750c57fd7..92aa92917 100644 --- a/federationapi/statistics/statistics.go +++ b/federationapi/statistics/statistics.go @@ -10,7 +10,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/federationapi/storage" + "github.com/element-hq/dendrite/federationapi/storage" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/statistics/statistics_test.go b/federationapi/statistics/statistics_test.go index 4376a9050..aeab42fb5 100644 --- a/federationapi/statistics/statistics_test.go +++ b/federationapi/statistics/statistics_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/stretchr/testify/assert" ) diff --git a/federationapi/storage/cache/keydb.go b/federationapi/storage/cache/keydb.go index d63c889d5..6bba85fa7 100644 --- a/federationapi/storage/cache/keydb.go +++ b/federationapi/storage/cache/keydb.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/matrix-org/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/caching" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/interface.go b/federationapi/storage/interface.go index 74c7c4b6c..c7e5c06a4 100644 --- a/federationapi/storage/interface.go +++ b/federationapi/storage/interface.go @@ -13,9 +13,9 @@ import ( "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/federationapi/storage/shared/receipt" - "github.com/matrix-org/dendrite/federationapi/types" - rstypes "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/federationapi/storage/shared/receipt" + "github.com/element-hq/dendrite/federationapi/types" + rstypes "github.com/element-hq/dendrite/roomserver/types" ) type Database interface { diff --git a/federationapi/storage/postgres/assumed_offline_table.go b/federationapi/storage/postgres/assumed_offline_table.go index 64a2c9f8c..052d2034b 100644 --- a/federationapi/storage/postgres/assumed_offline_table.go +++ b/federationapi/storage/postgres/assumed_offline_table.go @@ -10,7 +10,7 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/postgres/blacklist_table.go b/federationapi/storage/postgres/blacklist_table.go index 97916e3ed..bf1313923 100644 --- a/federationapi/storage/postgres/blacklist_table.go +++ b/federationapi/storage/postgres/blacklist_table.go @@ -10,7 +10,7 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/postgres/inbound_peeks_table.go b/federationapi/storage/postgres/inbound_peeks_table.go index 58bea7ca4..45484e563 100644 --- a/federationapi/storage/postgres/inbound_peeks_table.go +++ b/federationapi/storage/postgres/inbound_peeks_table.go @@ -11,9 +11,9 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/federationapi/types" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/federationapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/postgres/joined_hosts_table.go b/federationapi/storage/postgres/joined_hosts_table.go index d507bffe2..be27aba86 100644 --- a/federationapi/storage/postgres/joined_hosts_table.go +++ b/federationapi/storage/postgres/joined_hosts_table.go @@ -12,9 +12,9 @@ import ( "database/sql" "github.com/lib/pq" - "github.com/matrix-org/dendrite/federationapi/types" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/federationapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/postgres/notary_server_keys_json_table.go b/federationapi/storage/postgres/notary_server_keys_json_table.go index 4477355cd..e4f8a870d 100644 --- a/federationapi/storage/postgres/notary_server_keys_json_table.go +++ b/federationapi/storage/postgres/notary_server_keys_json_table.go @@ -10,8 +10,8 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/federationapi/storage/tables" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/federationapi/storage/tables" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/postgres/notary_server_keys_metadata_table.go b/federationapi/storage/postgres/notary_server_keys_metadata_table.go index e8946ead5..ca8fae5cd 100644 --- a/federationapi/storage/postgres/notary_server_keys_metadata_table.go +++ b/federationapi/storage/postgres/notary_server_keys_metadata_table.go @@ -12,9 +12,9 @@ import ( "encoding/json" "github.com/lib/pq" - "github.com/matrix-org/dendrite/federationapi/storage/tables" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/federationapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/postgres/outbound_peeks_table.go b/federationapi/storage/postgres/outbound_peeks_table.go index acb8d53d5..47b2dd92a 100644 --- a/federationapi/storage/postgres/outbound_peeks_table.go +++ b/federationapi/storage/postgres/outbound_peeks_table.go @@ -11,9 +11,9 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/federationapi/types" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/federationapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/postgres/queue_edus_table.go b/federationapi/storage/postgres/queue_edus_table.go index cf6520c32..394899ee4 100644 --- a/federationapi/storage/postgres/queue_edus_table.go +++ b/federationapi/storage/postgres/queue_edus_table.go @@ -12,9 +12,9 @@ import ( "github.com/lib/pq" - "github.com/matrix-org/dendrite/federationapi/storage/postgres/deltas" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/federationapi/storage/postgres/deltas" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/postgres/queue_json_table.go b/federationapi/storage/postgres/queue_json_table.go index 1d5016465..c9e6bc4ce 100644 --- a/federationapi/storage/postgres/queue_json_table.go +++ b/federationapi/storage/postgres/queue_json_table.go @@ -11,8 +11,8 @@ import ( "database/sql" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" ) const queueJSONSchema = ` diff --git a/federationapi/storage/postgres/queue_pdus_table.go b/federationapi/storage/postgres/queue_pdus_table.go index fbc581ae1..4d321620f 100644 --- a/federationapi/storage/postgres/queue_pdus_table.go +++ b/federationapi/storage/postgres/queue_pdus_table.go @@ -11,8 +11,8 @@ import ( "database/sql" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/postgres/relay_servers_table.go b/federationapi/storage/postgres/relay_servers_table.go index d1b1d5cc0..47b69db98 100644 --- a/federationapi/storage/postgres/relay_servers_table.go +++ b/federationapi/storage/postgres/relay_servers_table.go @@ -11,8 +11,8 @@ import ( "database/sql" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/postgres/server_key_table.go b/federationapi/storage/postgres/server_key_table.go index 8afc3a022..b342c6f57 100644 --- a/federationapi/storage/postgres/server_key_table.go +++ b/federationapi/storage/postgres/server_key_table.go @@ -12,8 +12,8 @@ import ( "database/sql" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/postgres/storage.go b/federationapi/storage/postgres/storage.go index 53ebcddce..2145932f7 100644 --- a/federationapi/storage/postgres/storage.go +++ b/federationapi/storage/postgres/storage.go @@ -12,11 +12,11 @@ import ( "database/sql" "fmt" - "github.com/matrix-org/dendrite/federationapi/storage/postgres/deltas" - "github.com/matrix-org/dendrite/federationapi/storage/shared" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/federationapi/storage/postgres/deltas" + "github.com/element-hq/dendrite/federationapi/storage/shared" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/shared/storage.go b/federationapi/storage/shared/storage.go index f623e2adf..271f99fbc 100644 --- a/federationapi/storage/shared/storage.go +++ b/federationapi/storage/shared/storage.go @@ -12,11 +12,11 @@ import ( "fmt" "time" - "github.com/matrix-org/dendrite/federationapi/storage/shared/receipt" - "github.com/matrix-org/dendrite/federationapi/storage/tables" - "github.com/matrix-org/dendrite/federationapi/types" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/federationapi/storage/shared/receipt" + "github.com/element-hq/dendrite/federationapi/storage/tables" + "github.com/element-hq/dendrite/federationapi/types" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/shared/storage_edus.go b/federationapi/storage/shared/storage_edus.go index 2216c926f..c764f00d2 100644 --- a/federationapi/storage/shared/storage_edus.go +++ b/federationapi/storage/shared/storage_edus.go @@ -14,7 +14,7 @@ import ( "fmt" "time" - "github.com/matrix-org/dendrite/federationapi/storage/shared/receipt" + "github.com/element-hq/dendrite/federationapi/storage/shared/receipt" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/shared/storage_pdus.go b/federationapi/storage/shared/storage_pdus.go index 680def7f5..f2729469b 100644 --- a/federationapi/storage/shared/storage_pdus.go +++ b/federationapi/storage/shared/storage_pdus.go @@ -13,8 +13,8 @@ import ( "errors" "fmt" - "github.com/matrix-org/dendrite/federationapi/storage/shared/receipt" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/federationapi/storage/shared/receipt" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/sqlite3/assumed_offline_table.go b/federationapi/storage/sqlite3/assumed_offline_table.go index b374b5c5c..962c1fcd2 100644 --- a/federationapi/storage/sqlite3/assumed_offline_table.go +++ b/federationapi/storage/sqlite3/assumed_offline_table.go @@ -10,7 +10,7 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/sqlite3/blacklist_table.go b/federationapi/storage/sqlite3/blacklist_table.go index bc328ab0f..b35fa0f67 100644 --- a/federationapi/storage/sqlite3/blacklist_table.go +++ b/federationapi/storage/sqlite3/blacklist_table.go @@ -10,7 +10,7 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/sqlite3/inbound_peeks_table.go b/federationapi/storage/sqlite3/inbound_peeks_table.go index 14d50189d..56957a563 100644 --- a/federationapi/storage/sqlite3/inbound_peeks_table.go +++ b/federationapi/storage/sqlite3/inbound_peeks_table.go @@ -11,9 +11,9 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/federationapi/types" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/federationapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/sqlite3/joined_hosts_table.go b/federationapi/storage/sqlite3/joined_hosts_table.go index 0d662dbe3..6588667c7 100644 --- a/federationapi/storage/sqlite3/joined_hosts_table.go +++ b/federationapi/storage/sqlite3/joined_hosts_table.go @@ -12,9 +12,9 @@ import ( "database/sql" "strings" - "github.com/matrix-org/dendrite/federationapi/types" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/federationapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/sqlite3/notary_server_keys_json_table.go b/federationapi/storage/sqlite3/notary_server_keys_json_table.go index 0d856c4c7..2c2980581 100644 --- a/federationapi/storage/sqlite3/notary_server_keys_json_table.go +++ b/federationapi/storage/sqlite3/notary_server_keys_json_table.go @@ -10,8 +10,8 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/federationapi/storage/tables" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/federationapi/storage/tables" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go b/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go index 06fa5e980..cf2e21aa3 100644 --- a/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go +++ b/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go @@ -13,9 +13,9 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/federationapi/storage/tables" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/federationapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/sqlite3/outbound_peeks_table.go b/federationapi/storage/sqlite3/outbound_peeks_table.go index ae476fd38..18a87864a 100644 --- a/federationapi/storage/sqlite3/outbound_peeks_table.go +++ b/federationapi/storage/sqlite3/outbound_peeks_table.go @@ -11,9 +11,9 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/federationapi/types" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/federationapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/sqlite3/queue_edus_table.go b/federationapi/storage/sqlite3/queue_edus_table.go index aa04b3652..0979c95c0 100644 --- a/federationapi/storage/sqlite3/queue_edus_table.go +++ b/federationapi/storage/sqlite3/queue_edus_table.go @@ -12,9 +12,9 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/federationapi/storage/sqlite3/deltas" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/federationapi/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/sqlite3/queue_json_table.go b/federationapi/storage/sqlite3/queue_json_table.go index 851309a95..a84e740dd 100644 --- a/federationapi/storage/sqlite3/queue_json_table.go +++ b/federationapi/storage/sqlite3/queue_json_table.go @@ -13,8 +13,8 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" ) const queueJSONSchema = ` diff --git a/federationapi/storage/sqlite3/queue_pdus_table.go b/federationapi/storage/sqlite3/queue_pdus_table.go index 353f39757..667a4de8d 100644 --- a/federationapi/storage/sqlite3/queue_pdus_table.go +++ b/federationapi/storage/sqlite3/queue_pdus_table.go @@ -13,8 +13,8 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/sqlite3/relay_servers_table.go b/federationapi/storage/sqlite3/relay_servers_table.go index 91394b765..98eb27a47 100644 --- a/federationapi/storage/sqlite3/relay_servers_table.go +++ b/federationapi/storage/sqlite3/relay_servers_table.go @@ -11,8 +11,8 @@ import ( "database/sql" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/sqlite3/server_key_table.go b/federationapi/storage/sqlite3/server_key_table.go index eb6f3fa2a..1bc7ce271 100644 --- a/federationapi/storage/sqlite3/server_key_table.go +++ b/federationapi/storage/sqlite3/server_key_table.go @@ -12,7 +12,7 @@ import ( "database/sql" "fmt" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/sqlite3/storage.go b/federationapi/storage/sqlite3/storage.go index 3ec83a04b..e7f9490b1 100644 --- a/federationapi/storage/sqlite3/storage.go +++ b/federationapi/storage/sqlite3/storage.go @@ -10,11 +10,11 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/federationapi/storage/shared" - "github.com/matrix-org/dendrite/federationapi/storage/sqlite3/deltas" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/federationapi/storage/shared" + "github.com/element-hq/dendrite/federationapi/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/storage.go b/federationapi/storage/storage.go index 6232a2f27..27d7f3427 100644 --- a/federationapi/storage/storage.go +++ b/federationapi/storage/storage.go @@ -13,11 +13,11 @@ import ( "context" "fmt" - "github.com/matrix-org/dendrite/federationapi/storage/postgres" - "github.com/matrix-org/dendrite/federationapi/storage/sqlite3" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/federationapi/storage/postgres" + "github.com/element-hq/dendrite/federationapi/storage/sqlite3" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/storage_test.go b/federationapi/storage/storage_test.go index db71f2c13..416e7e12f 100644 --- a/federationapi/storage/storage_test.go +++ b/federationapi/storage/storage_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/federationapi/storage" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/federationapi/storage" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/federationapi/storage/storage_wasm.go b/federationapi/storage/storage_wasm.go index 5035ea3f2..dad6d82b5 100644 --- a/federationapi/storage/storage_wasm.go +++ b/federationapi/storage/storage_wasm.go @@ -10,10 +10,10 @@ import ( "context" "fmt" - "github.com/matrix-org/dendrite/federationapi/storage/sqlite3" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/federationapi/storage/sqlite3" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/federationapi/storage/tables/inbound_peeks_table_test.go b/federationapi/storage/tables/inbound_peeks_table_test.go index e5d898b3a..36f9ad4b8 100644 --- a/federationapi/storage/tables/inbound_peeks_table_test.go +++ b/federationapi/storage/tables/inbound_peeks_table_test.go @@ -5,12 +5,12 @@ import ( "reflect" "testing" - "github.com/matrix-org/dendrite/federationapi/storage/postgres" - "github.com/matrix-org/dendrite/federationapi/storage/sqlite3" - "github.com/matrix-org/dendrite/federationapi/storage/tables" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/federationapi/storage/postgres" + "github.com/element-hq/dendrite/federationapi/storage/sqlite3" + "github.com/element-hq/dendrite/federationapi/storage/tables" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" "github.com/stretchr/testify/assert" diff --git a/federationapi/storage/tables/interface.go b/federationapi/storage/tables/interface.go index a9fef1982..d94344d02 100644 --- a/federationapi/storage/tables/interface.go +++ b/federationapi/storage/tables/interface.go @@ -10,7 +10,7 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/federationapi/types" + "github.com/element-hq/dendrite/federationapi/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/tables/outbound_peeks_table_test.go b/federationapi/storage/tables/outbound_peeks_table_test.go index a460af09d..d7fb07676 100644 --- a/federationapi/storage/tables/outbound_peeks_table_test.go +++ b/federationapi/storage/tables/outbound_peeks_table_test.go @@ -5,12 +5,12 @@ import ( "reflect" "testing" - "github.com/matrix-org/dendrite/federationapi/storage/postgres" - "github.com/matrix-org/dendrite/federationapi/storage/sqlite3" - "github.com/matrix-org/dendrite/federationapi/storage/tables" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/federationapi/storage/postgres" + "github.com/element-hq/dendrite/federationapi/storage/sqlite3" + "github.com/element-hq/dendrite/federationapi/storage/tables" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" "github.com/stretchr/testify/assert" diff --git a/federationapi/storage/tables/relay_servers_table_test.go b/federationapi/storage/tables/relay_servers_table_test.go index 6a14e3f16..71013e076 100644 --- a/federationapi/storage/tables/relay_servers_table_test.go +++ b/federationapi/storage/tables/relay_servers_table_test.go @@ -5,12 +5,12 @@ import ( "database/sql" "testing" - "github.com/matrix-org/dendrite/federationapi/storage/postgres" - "github.com/matrix-org/dendrite/federationapi/storage/sqlite3" - "github.com/matrix-org/dendrite/federationapi/storage/tables" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/federationapi/storage/postgres" + "github.com/element-hq/dendrite/federationapi/storage/sqlite3" + "github.com/element-hq/dendrite/federationapi/storage/tables" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/stretchr/testify/assert" ) diff --git a/federationapi/storage/tables/server_key_table_test.go b/federationapi/storage/tables/server_key_table_test.go index e79a086b8..322169bd0 100644 --- a/federationapi/storage/tables/server_key_table_test.go +++ b/federationapi/storage/tables/server_key_table_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/federationapi/storage/postgres" - "github.com/matrix-org/dendrite/federationapi/storage/sqlite3" - "github.com/matrix-org/dendrite/federationapi/storage/tables" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/federationapi/storage/postgres" + "github.com/element-hq/dendrite/federationapi/storage/sqlite3" + "github.com/element-hq/dendrite/federationapi/storage/tables" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/stretchr/testify/assert" diff --git a/go.mod b/go.mod index 4add5ae1a..f17c1a8b8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/matrix-org/dendrite +module github.com/element-hq/dendrite require ( github.com/Arceliar/phony v0.0.0-20220903101357-530938a4b13d diff --git a/internal/caching/cache_eventstatekeys.go b/internal/caching/cache_eventstatekeys.go index 51e2499d5..f70c56e47 100644 --- a/internal/caching/cache_eventstatekeys.go +++ b/internal/caching/cache_eventstatekeys.go @@ -1,6 +1,6 @@ package caching -import "github.com/matrix-org/dendrite/roomserver/types" +import "github.com/element-hq/dendrite/roomserver/types" // EventStateKeyCache contains the subset of functions needed for // a room event state key cache. diff --git a/internal/caching/cache_federationevents.go b/internal/caching/cache_federationevents.go index fc1f5496e..4af8cbc62 100644 --- a/internal/caching/cache_federationevents.go +++ b/internal/caching/cache_federationevents.go @@ -1,7 +1,7 @@ package caching import ( - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/internal/caching/cache_lazy_load_members.go b/internal/caching/cache_lazy_load_members.go index 390334da7..8bc5add25 100644 --- a/internal/caching/cache_lazy_load_members.go +++ b/internal/caching/cache_lazy_load_members.go @@ -1,7 +1,7 @@ package caching import ( - userapi "github.com/matrix-org/dendrite/userapi/api" + userapi "github.com/element-hq/dendrite/userapi/api" ) type lazyLoadingCacheKey struct { diff --git a/internal/caching/cache_roomevents.go b/internal/caching/cache_roomevents.go index e8bbe208e..371683d13 100644 --- a/internal/caching/cache_roomevents.go +++ b/internal/caching/cache_roomevents.go @@ -1,7 +1,7 @@ package caching import ( - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" ) // RoomServerEventsCache contains the subset of functions needed for diff --git a/internal/caching/cache_roomservernids.go b/internal/caching/cache_roomservernids.go index fa0781ef3..229124fa0 100644 --- a/internal/caching/cache_roomservernids.go +++ b/internal/caching/cache_roomservernids.go @@ -1,7 +1,7 @@ package caching import ( - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" ) type RoomServerCaches interface { diff --git a/internal/caching/cache_typing_test.go b/internal/caching/cache_typing_test.go index a1928b40c..661c09079 100644 --- a/internal/caching/cache_typing_test.go +++ b/internal/caching/cache_typing_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/test" ) func TestEDUCache(t *testing.T) { diff --git a/internal/caching/caches.go b/internal/caching/caches.go index bf35b5388..4a9fd1c9f 100644 --- a/internal/caching/caches.go +++ b/internal/caching/caches.go @@ -7,7 +7,7 @@ package caching import ( - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" ) diff --git a/internal/caching/impl_ristretto.go b/internal/caching/impl_ristretto.go index 23eb3c2fa..be9515d21 100644 --- a/internal/caching/impl_ristretto.go +++ b/internal/caching/impl_ristretto.go @@ -19,8 +19,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" ) const ( diff --git a/internal/eventutil/events.go b/internal/eventutil/events.go index d7b9c462a..a1dcfc408 100644 --- a/internal/eventutil/events.go +++ b/internal/eventutil/events.go @@ -12,9 +12,9 @@ import ( "fmt" "time" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/synctypes" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/internal/eventutil/types.go b/internal/eventutil/types.go index d1a0049d8..203ff2bc3 100644 --- a/internal/eventutil/types.go +++ b/internal/eventutil/types.go @@ -9,7 +9,7 @@ package eventutil import ( "strconv" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/syncapi/types" ) // AccountData represents account data sent from the client API server to the diff --git a/internal/fulltext/bleve.go b/internal/fulltext/bleve.go index 98329429c..fddf3a9aa 100644 --- a/internal/fulltext/bleve.go +++ b/internal/fulltext/bleve.go @@ -14,7 +14,7 @@ import ( "strings" "github.com/blevesearch/bleve/v2" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/setup/process" "github.com/matrix-org/gomatrixserverlib/spec" // side effect imports to allow all possible languages @@ -41,7 +41,7 @@ import ( _ "github.com/blevesearch/bleve/v2/analysis/lang/tr" "github.com/blevesearch/bleve/v2/mapping" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/config" ) // Search contains all existing bleve.Index diff --git a/internal/fulltext/bleve_test.go b/internal/fulltext/bleve_test.go index e32a257eb..b9be15a41 100644 --- a/internal/fulltext/bleve_test.go +++ b/internal/fulltext/bleve_test.go @@ -10,12 +10,12 @@ import ( "reflect" "testing" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/setup/process" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/internal/fulltext" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/fulltext" + "github.com/element-hq/dendrite/setup/config" ) func mustOpenIndex(t *testing.T, tempDir string) (*fulltext.Search, *process.ProcessContext) { diff --git a/internal/fulltext/bleve_wasm.go b/internal/fulltext/bleve_wasm.go index 782524c04..2eadf1262 100644 --- a/internal/fulltext/bleve_wasm.go +++ b/internal/fulltext/bleve_wasm.go @@ -9,7 +9,7 @@ package fulltext import ( "time" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/config" ) type Search struct{} diff --git a/internal/httputil/httpapi.go b/internal/httputil/httpapi.go index 5cf977856..b48b2b22b 100644 --- a/internal/httputil/httpapi.go +++ b/internal/httputil/httpapi.go @@ -23,9 +23,9 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/clientapi/auth" - "github.com/matrix-org/dendrite/internal" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/auth" + "github.com/element-hq/dendrite/internal" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/internal/httputil/rate_limiting.go b/internal/httputil/rate_limiting.go index 0b040d7f3..e0870dcef 100644 --- a/internal/httputil/rate_limiting.go +++ b/internal/httputil/rate_limiting.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/internal/log.go b/internal/log.go index 150dee750..4954b05b1 100644 --- a/internal/log.go +++ b/internal/log.go @@ -23,7 +23,7 @@ import ( "github.com/matrix-org/dugong" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/config" ) // logrus is using a global variable when we're using `logrus.AddHook` diff --git a/internal/log_unix.go b/internal/log_unix.go index f4a22c8a4..9e66e4f8e 100644 --- a/internal/log_unix.go +++ b/internal/log_unix.go @@ -17,7 +17,7 @@ import ( "github.com/sirupsen/logrus" lSyslog "github.com/sirupsen/logrus/hooks/syslog" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/config" ) // SetupHookLogging configures the logging hooks defined in the configuration. diff --git a/internal/log_windows.go b/internal/log_windows.go index baeebbc97..7a96594e4 100644 --- a/internal/log_windows.go +++ b/internal/log_windows.go @@ -7,7 +7,7 @@ package internal import ( - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/config" "github.com/sirupsen/logrus" ) diff --git a/internal/pushgateway/client.go b/internal/pushgateway/client.go index d5671be3b..43ee5f8b1 100644 --- a/internal/pushgateway/client.go +++ b/internal/pushgateway/client.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - "github.com/matrix-org/dendrite/internal" + "github.com/element-hq/dendrite/internal" ) type httpClient struct { diff --git a/internal/sqlutil/connection_manager.go b/internal/sqlutil/connection_manager.go index 4554eeb47..afbbf8b49 100644 --- a/internal/sqlutil/connection_manager.go +++ b/internal/sqlutil/connection_manager.go @@ -11,8 +11,8 @@ import ( "fmt" "sync" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/process" ) type Connections struct { diff --git a/internal/sqlutil/connection_manager_test.go b/internal/sqlutil/connection_manager_test.go index 5086684b5..0195b7add 100644 --- a/internal/sqlutil/connection_manager_test.go +++ b/internal/sqlutil/connection_manager_test.go @@ -4,10 +4,10 @@ import ( "reflect" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/test" ) func TestConnectionManager(t *testing.T) { diff --git a/internal/sqlutil/migrate.go b/internal/sqlutil/migrate.go index 1042dbd0f..b9fb9bf5f 100644 --- a/internal/sqlutil/migrate.go +++ b/internal/sqlutil/migrate.go @@ -15,7 +15,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal" + "github.com/element-hq/dendrite/internal" ) const createDBMigrationsSQL = "" + diff --git a/internal/sqlutil/migrate_test.go b/internal/sqlutil/migrate_test.go index 30aa6790c..68c565733 100644 --- a/internal/sqlutil/migrate_test.go +++ b/internal/sqlutil/migrate_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/test" ) var dummyMigrations = []sqlutil.Migration{ diff --git a/internal/sqlutil/sqlutil.go b/internal/sqlutil/sqlutil.go index b2d0d2186..00ea117b5 100644 --- a/internal/sqlutil/sqlutil.go +++ b/internal/sqlutil/sqlutil.go @@ -6,7 +6,7 @@ import ( "fmt" "regexp" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/config" "github.com/sirupsen/logrus" ) diff --git a/internal/sqlutil/uri.go b/internal/sqlutil/uri.go index dd1b552a6..b95871089 100644 --- a/internal/sqlutil/uri.go +++ b/internal/sqlutil/uri.go @@ -11,7 +11,7 @@ import ( "fmt" "net/url" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/config" ) // ParseFileURI returns the filepath in the given file: URI. Specifically, this will handle diff --git a/internal/transactionrequest.go b/internal/transactionrequest.go index 3dcf1b725..b4f0ef127 100644 --- a/internal/transactionrequest.go +++ b/internal/transactionrequest.go @@ -13,12 +13,12 @@ import ( "sync" "github.com/getsentry/sentry-go" - "github.com/matrix-org/dendrite/federationapi/producers" - "github.com/matrix-org/dendrite/federationapi/types" - "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - syncTypes "github.com/matrix-org/dendrite/syncapi/types" - userAPI "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/federationapi/producers" + "github.com/element-hq/dendrite/federationapi/types" + "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + syncTypes "github.com/element-hq/dendrite/syncapi/types" + userAPI "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/internal/transactionrequest_test.go b/internal/transactionrequest_test.go index 1489baa05..84dd9d8dd 100644 --- a/internal/transactionrequest_test.go +++ b/internal/transactionrequest_test.go @@ -21,15 +21,15 @@ import ( "github.com/stretchr/testify/assert" "gotest.tools/v3/poll" - "github.com/matrix-org/dendrite/federationapi/producers" - rsAPI "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/test" - keyAPI "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/federationapi/producers" + rsAPI "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/test" + keyAPI "github.com/element-hq/dendrite/userapi/api" ) const ( diff --git a/internal/validate.go b/internal/validate.go index 855ec35fd..4b0667f21 100644 --- a/internal/validate.go +++ b/internal/validate.go @@ -12,8 +12,8 @@ import ( "net/http" "regexp" - "github.com/matrix-org/dendrite/clientapi/userutil" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/clientapi/userutil" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/internal/validate_test.go b/internal/validate_test.go index 1019102df..5ddb1b295 100644 --- a/internal/validate_test.go +++ b/internal/validate_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/internal/version.go b/internal/version.go index e5ff5af8e..6e5a5f94e 100644 --- a/internal/version.go +++ b/internal/version.go @@ -9,10 +9,10 @@ import ( // the final version string var version string -// -ldflags "-X github.com/matrix-org/dendrite/internal.branch=master" +// -ldflags "-X github.com/element-hq/dendrite/internal.branch=master" var branch string -// -ldflags "-X github.com/matrix-org/dendrite/internal.build=alpha" +// -ldflags "-X github.com/element-hq/dendrite/internal.build=alpha" var build string const ( diff --git a/mediaapi/fileutils/fileutils.go b/mediaapi/fileutils/fileutils.go index f3e26b968..6d1dfd6d0 100644 --- a/mediaapi/fileutils/fileutils.go +++ b/mediaapi/fileutils/fileutils.go @@ -17,8 +17,8 @@ import ( "path/filepath" "strings" - "github.com/matrix-org/dendrite/mediaapi/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/util" log "github.com/sirupsen/logrus" ) diff --git a/mediaapi/mediaapi.go b/mediaapi/mediaapi.go index 86f595d15..ff175df8b 100644 --- a/mediaapi/mediaapi.go +++ b/mediaapi/mediaapi.go @@ -7,12 +7,12 @@ package mediaapi import ( - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/mediaapi/routing" - "github.com/matrix-org/dendrite/mediaapi/storage" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/mediaapi/routing" + "github.com/element-hq/dendrite/mediaapi/storage" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/sirupsen/logrus" diff --git a/mediaapi/routing/download.go b/mediaapi/routing/download.go index f2b61a781..a73d383ef 100644 --- a/mediaapi/routing/download.go +++ b/mediaapi/routing/download.go @@ -25,11 +25,11 @@ import ( "sync" "unicode" - "github.com/matrix-org/dendrite/mediaapi/fileutils" - "github.com/matrix-org/dendrite/mediaapi/storage" - "github.com/matrix-org/dendrite/mediaapi/thumbnailer" - "github.com/matrix-org/dendrite/mediaapi/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/mediaapi/fileutils" + "github.com/element-hq/dendrite/mediaapi/storage" + "github.com/element-hq/dendrite/mediaapi/thumbnailer" + "github.com/element-hq/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/mediaapi/routing/download_test.go b/mediaapi/routing/download_test.go index 9654b7474..4a91ad50b 100644 --- a/mediaapi/routing/download_test.go +++ b/mediaapi/routing/download_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "github.com/matrix-org/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/mediaapi/types" "github.com/stretchr/testify/assert" ) diff --git a/mediaapi/routing/routing.go b/mediaapi/routing/routing.go index c5edea213..ed638dc3c 100644 --- a/mediaapi/routing/routing.go +++ b/mediaapi/routing/routing.go @@ -12,12 +12,12 @@ import ( "strings" "github.com/gorilla/mux" - "github.com/matrix-org/dendrite/federationapi/routing" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/mediaapi/storage" - "github.com/matrix-org/dendrite/mediaapi/types" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/federationapi/routing" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/mediaapi/storage" + "github.com/element-hq/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/mediaapi/routing/upload.go b/mediaapi/routing/upload.go index 0ed0450c5..e3e5cb9ee 100644 --- a/mediaapi/routing/upload.go +++ b/mediaapi/routing/upload.go @@ -18,12 +18,12 @@ import ( "path" "strings" - "github.com/matrix-org/dendrite/mediaapi/fileutils" - "github.com/matrix-org/dendrite/mediaapi/storage" - "github.com/matrix-org/dendrite/mediaapi/thumbnailer" - "github.com/matrix-org/dendrite/mediaapi/types" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/mediaapi/fileutils" + "github.com/element-hq/dendrite/mediaapi/storage" + "github.com/element-hq/dendrite/mediaapi/thumbnailer" + "github.com/element-hq/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/mediaapi/routing/upload_test.go b/mediaapi/routing/upload_test.go index d088950ca..fb5c8f9e8 100644 --- a/mediaapi/routing/upload_test.go +++ b/mediaapi/routing/upload_test.go @@ -9,11 +9,11 @@ import ( "strings" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/mediaapi/fileutils" - "github.com/matrix-org/dendrite/mediaapi/storage" - "github.com/matrix-org/dendrite/mediaapi/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/mediaapi/fileutils" + "github.com/element-hq/dendrite/mediaapi/storage" + "github.com/element-hq/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/util" log "github.com/sirupsen/logrus" ) diff --git a/mediaapi/storage/interface.go b/mediaapi/storage/interface.go index 3baa0022b..72979b3cd 100644 --- a/mediaapi/storage/interface.go +++ b/mediaapi/storage/interface.go @@ -9,7 +9,7 @@ package storage import ( "context" - "github.com/matrix-org/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/mediaapi/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/mediaapi/storage/postgres/media_repository_table.go b/mediaapi/storage/postgres/media_repository_table.go index 018a369d5..5eb3e109a 100644 --- a/mediaapi/storage/postgres/media_repository_table.go +++ b/mediaapi/storage/postgres/media_repository_table.go @@ -12,9 +12,9 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/mediaapi/storage/tables" - "github.com/matrix-org/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/mediaapi/storage/tables" + "github.com/element-hq/dendrite/mediaapi/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/mediaapi/storage/postgres/mediaapi.go b/mediaapi/storage/postgres/mediaapi.go index ea4ef3286..365c39bd5 100644 --- a/mediaapi/storage/postgres/mediaapi.go +++ b/mediaapi/storage/postgres/mediaapi.go @@ -10,9 +10,9 @@ package postgres import ( // Import the postgres database driver. _ "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/mediaapi/storage/shared" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/mediaapi/storage/shared" + "github.com/element-hq/dendrite/setup/config" ) // NewDatabase opens a postgres database. diff --git a/mediaapi/storage/postgres/thumbnail_table.go b/mediaapi/storage/postgres/thumbnail_table.go index 67a5dcaf8..2f875b6f3 100644 --- a/mediaapi/storage/postgres/thumbnail_table.go +++ b/mediaapi/storage/postgres/thumbnail_table.go @@ -12,10 +12,10 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/mediaapi/storage/tables" - "github.com/matrix-org/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/mediaapi/storage/tables" + "github.com/element-hq/dendrite/mediaapi/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/mediaapi/storage/shared/mediaapi.go b/mediaapi/storage/shared/mediaapi.go index 905d0261f..2bbe2addf 100644 --- a/mediaapi/storage/shared/mediaapi.go +++ b/mediaapi/storage/shared/mediaapi.go @@ -11,9 +11,9 @@ import ( "database/sql" "errors" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/mediaapi/storage/tables" - "github.com/matrix-org/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/mediaapi/storage/tables" + "github.com/element-hq/dendrite/mediaapi/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/mediaapi/storage/sqlite3/media_repository_table.go b/mediaapi/storage/sqlite3/media_repository_table.go index cd7e77350..27b079956 100644 --- a/mediaapi/storage/sqlite3/media_repository_table.go +++ b/mediaapi/storage/sqlite3/media_repository_table.go @@ -12,9 +12,9 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/mediaapi/storage/tables" - "github.com/matrix-org/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/mediaapi/storage/tables" + "github.com/element-hq/dendrite/mediaapi/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/mediaapi/storage/sqlite3/mediaapi.go b/mediaapi/storage/sqlite3/mediaapi.go index 0be1c2a64..ed75258d9 100644 --- a/mediaapi/storage/sqlite3/mediaapi.go +++ b/mediaapi/storage/sqlite3/mediaapi.go @@ -9,9 +9,9 @@ package sqlite3 import ( // Import the postgres database driver. - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/mediaapi/storage/shared" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/mediaapi/storage/shared" + "github.com/element-hq/dendrite/setup/config" ) // NewDatabase opens a SQLIte database. diff --git a/mediaapi/storage/sqlite3/thumbnail_table.go b/mediaapi/storage/sqlite3/thumbnail_table.go index 9c3467a69..7b5bfc503 100644 --- a/mediaapi/storage/sqlite3/thumbnail_table.go +++ b/mediaapi/storage/sqlite3/thumbnail_table.go @@ -12,10 +12,10 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/mediaapi/storage/tables" - "github.com/matrix-org/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/mediaapi/storage/tables" + "github.com/element-hq/dendrite/mediaapi/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/mediaapi/storage/storage.go b/mediaapi/storage/storage.go index d543e4633..1c7b8d3f9 100644 --- a/mediaapi/storage/storage.go +++ b/mediaapi/storage/storage.go @@ -12,10 +12,10 @@ package storage import ( "fmt" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/mediaapi/storage/postgres" - "github.com/matrix-org/dendrite/mediaapi/storage/sqlite3" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/mediaapi/storage/postgres" + "github.com/element-hq/dendrite/mediaapi/storage/sqlite3" + "github.com/element-hq/dendrite/setup/config" ) // NewMediaAPIDatasource opens a database connection. diff --git a/mediaapi/storage/storage_test.go b/mediaapi/storage/storage_test.go index 8cd29a54d..b87f9f138 100644 --- a/mediaapi/storage/storage_test.go +++ b/mediaapi/storage/storage_test.go @@ -5,11 +5,11 @@ import ( "reflect" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/mediaapi/storage" - "github.com/matrix-org/dendrite/mediaapi/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/mediaapi/storage" + "github.com/element-hq/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" ) func mustCreateDatabase(t *testing.T, dbType test.DBType) (storage.Database, func()) { diff --git a/mediaapi/storage/storage_wasm.go b/mediaapi/storage/storage_wasm.go index 905c5b222..3a9369cfe 100644 --- a/mediaapi/storage/storage_wasm.go +++ b/mediaapi/storage/storage_wasm.go @@ -9,9 +9,9 @@ package storage import ( "fmt" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/mediaapi/storage/sqlite3" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/mediaapi/storage/sqlite3" + "github.com/element-hq/dendrite/setup/config" ) // Open opens a postgres database. diff --git a/mediaapi/storage/tables/interface.go b/mediaapi/storage/tables/interface.go index f018e5493..f57ef899e 100644 --- a/mediaapi/storage/tables/interface.go +++ b/mediaapi/storage/tables/interface.go @@ -10,7 +10,7 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/mediaapi/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/mediaapi/thumbnailer/thumbnailer.go b/mediaapi/thumbnailer/thumbnailer.go index b469d740f..216b283f6 100644 --- a/mediaapi/thumbnailer/thumbnailer.go +++ b/mediaapi/thumbnailer/thumbnailer.go @@ -14,9 +14,9 @@ import ( "path/filepath" "sync" - "github.com/matrix-org/dendrite/mediaapi/storage" - "github.com/matrix-org/dendrite/mediaapi/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/mediaapi/storage" + "github.com/element-hq/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/setup/config" log "github.com/sirupsen/logrus" ) diff --git a/mediaapi/thumbnailer/thumbnailer_bimg.go b/mediaapi/thumbnailer/thumbnailer_bimg.go index f8e688505..6ea70c5be 100644 --- a/mediaapi/thumbnailer/thumbnailer_bimg.go +++ b/mediaapi/thumbnailer/thumbnailer_bimg.go @@ -14,9 +14,9 @@ import ( "os" "time" - "github.com/matrix-org/dendrite/mediaapi/storage" - "github.com/matrix-org/dendrite/mediaapi/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/mediaapi/storage" + "github.com/element-hq/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/setup/config" log "github.com/sirupsen/logrus" "gopkg.in/h2non/bimg.v1" ) diff --git a/mediaapi/thumbnailer/thumbnailer_nfnt.go b/mediaapi/thumbnailer/thumbnailer_nfnt.go index 825fe1a9b..b3c568bcb 100644 --- a/mediaapi/thumbnailer/thumbnailer_nfnt.go +++ b/mediaapi/thumbnailer/thumbnailer_nfnt.go @@ -27,9 +27,9 @@ import ( "os" "time" - "github.com/matrix-org/dendrite/mediaapi/storage" - "github.com/matrix-org/dendrite/mediaapi/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/mediaapi/storage" + "github.com/element-hq/dendrite/mediaapi/types" + "github.com/element-hq/dendrite/setup/config" "github.com/nfnt/resize" log "github.com/sirupsen/logrus" ) diff --git a/mediaapi/types/types.go b/mediaapi/types/types.go index 040014913..12c80b8e5 100644 --- a/mediaapi/types/types.go +++ b/mediaapi/types/types.go @@ -9,7 +9,7 @@ package types import ( "sync" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/relayapi/internal/api.go b/relayapi/internal/api.go index 13e88fd26..9deb5bbcb 100644 --- a/relayapi/internal/api.go +++ b/relayapi/internal/api.go @@ -9,9 +9,9 @@ package internal import ( "sync" - "github.com/matrix-org/dendrite/federationapi/producers" - "github.com/matrix-org/dendrite/relayapi/storage" - rsAPI "github.com/matrix-org/dendrite/roomserver/api" + "github.com/element-hq/dendrite/federationapi/producers" + "github.com/element-hq/dendrite/relayapi/storage" + rsAPI "github.com/element-hq/dendrite/roomserver/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/relayapi/internal/perform.go b/relayapi/internal/perform.go index 5de23508a..e204380f0 100644 --- a/relayapi/internal/perform.go +++ b/relayapi/internal/perform.go @@ -9,9 +9,9 @@ package internal import ( "context" - "github.com/matrix-org/dendrite/federationapi/storage/shared/receipt" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/relayapi/api" + "github.com/element-hq/dendrite/federationapi/storage/shared/receipt" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/relayapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/relayapi/internal/perform_test.go b/relayapi/internal/perform_test.go index 41431d1bb..686bec3cc 100644 --- a/relayapi/internal/perform_test.go +++ b/relayapi/internal/perform_test.go @@ -11,9 +11,9 @@ import ( "fmt" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/relayapi/storage/shared" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/relayapi/storage/shared" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/relayapi/relayapi.go b/relayapi/relayapi.go index bceb42ed3..3ac0cdfe9 100644 --- a/relayapi/relayapi.go +++ b/relayapi/relayapi.go @@ -7,16 +7,16 @@ package relayapi import ( - "github.com/matrix-org/dendrite/federationapi/producers" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/relayapi/api" - "github.com/matrix-org/dendrite/relayapi/internal" - "github.com/matrix-org/dendrite/relayapi/routing" - "github.com/matrix-org/dendrite/relayapi/storage" - rsAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/federationapi/producers" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/relayapi/api" + "github.com/element-hq/dendrite/relayapi/internal" + "github.com/element-hq/dendrite/relayapi/routing" + "github.com/element-hq/dendrite/relayapi/storage" + rsAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/sirupsen/logrus" diff --git a/relayapi/relayapi_test.go b/relayapi/relayapi_test.go index 2aa55666a..171661ba1 100644 --- a/relayapi/relayapi_test.go +++ b/relayapi/relayapi_test.go @@ -16,13 +16,13 @@ import ( "time" "github.com/gorilla/mux" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/signing" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/relayapi" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" + "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/signing" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/relayapi" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/relayapi/routing/relaytxn.go b/relayapi/routing/relaytxn.go index 760eb1f1a..6d53e0939 100644 --- a/relayapi/routing/relaytxn.go +++ b/relayapi/routing/relaytxn.go @@ -10,7 +10,7 @@ import ( "encoding/json" "net/http" - "github.com/matrix-org/dendrite/relayapi/api" + "github.com/element-hq/dendrite/relayapi/api" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/relayapi/routing/relaytxn_test.go b/relayapi/routing/relaytxn_test.go index 5b58db501..6a6cb004f 100644 --- a/relayapi/routing/relaytxn_test.go +++ b/relayapi/routing/relaytxn_test.go @@ -11,11 +11,11 @@ import ( "net/http" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/relayapi/internal" - "github.com/matrix-org/dendrite/relayapi/routing" - "github.com/matrix-org/dendrite/relayapi/storage/shared" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/relayapi/internal" + "github.com/element-hq/dendrite/relayapi/routing" + "github.com/element-hq/dendrite/relayapi/storage/shared" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/relayapi/routing/routing.go b/relayapi/routing/routing.go index 02391fb4c..5fe91c51d 100644 --- a/relayapi/routing/routing.go +++ b/relayapi/routing/routing.go @@ -13,9 +13,9 @@ import ( "github.com/getsentry/sentry-go" "github.com/gorilla/mux" - "github.com/matrix-org/dendrite/internal/httputil" - relayInternal "github.com/matrix-org/dendrite/relayapi/internal" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/httputil" + relayInternal "github.com/element-hq/dendrite/relayapi/internal" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/relayapi/routing/sendrelay.go b/relayapi/routing/sendrelay.go index 72673393f..a5fed47c9 100644 --- a/relayapi/routing/sendrelay.go +++ b/relayapi/routing/sendrelay.go @@ -10,7 +10,7 @@ import ( "encoding/json" "net/http" - "github.com/matrix-org/dendrite/relayapi/api" + "github.com/element-hq/dendrite/relayapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/relayapi/routing/sendrelay_test.go b/relayapi/routing/sendrelay_test.go index cb51a7ad4..6ae90c354 100644 --- a/relayapi/routing/sendrelay_test.go +++ b/relayapi/routing/sendrelay_test.go @@ -12,11 +12,11 @@ import ( "net/http" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/relayapi/internal" - "github.com/matrix-org/dendrite/relayapi/routing" - "github.com/matrix-org/dendrite/relayapi/storage/shared" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/relayapi/internal" + "github.com/element-hq/dendrite/relayapi/routing" + "github.com/element-hq/dendrite/relayapi/storage/shared" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/relayapi/storage/interface.go b/relayapi/storage/interface.go index 5d9fb9ca8..076156877 100644 --- a/relayapi/storage/interface.go +++ b/relayapi/storage/interface.go @@ -9,7 +9,7 @@ package storage import ( "context" - "github.com/matrix-org/dendrite/federationapi/storage/shared/receipt" + "github.com/element-hq/dendrite/federationapi/storage/shared/receipt" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/relayapi/storage/postgres/relay_queue_json_table.go b/relayapi/storage/postgres/relay_queue_json_table.go index a1424c339..f39c1738c 100644 --- a/relayapi/storage/postgres/relay_queue_json_table.go +++ b/relayapi/storage/postgres/relay_queue_json_table.go @@ -11,8 +11,8 @@ import ( "database/sql" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" ) const relayQueueJSONSchema = ` diff --git a/relayapi/storage/postgres/relay_queue_table.go b/relayapi/storage/postgres/relay_queue_table.go index 04bcee0bf..615cfbd12 100644 --- a/relayapi/storage/postgres/relay_queue_table.go +++ b/relayapi/storage/postgres/relay_queue_table.go @@ -11,8 +11,8 @@ import ( "database/sql" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/relayapi/storage/postgres/storage.go b/relayapi/storage/postgres/storage.go index 8ed2fe4e3..c89cde55a 100644 --- a/relayapi/storage/postgres/storage.go +++ b/relayapi/storage/postgres/storage.go @@ -9,10 +9,10 @@ package postgres import ( "database/sql" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/relayapi/storage/shared" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/relayapi/storage/shared" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/relayapi/storage/shared/storage.go b/relayapi/storage/shared/storage.go index df63432e6..1b5d0d21c 100644 --- a/relayapi/storage/shared/storage.go +++ b/relayapi/storage/shared/storage.go @@ -12,10 +12,10 @@ import ( "encoding/json" "fmt" - "github.com/matrix-org/dendrite/federationapi/storage/shared/receipt" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/relayapi/storage/tables" + "github.com/element-hq/dendrite/federationapi/storage/shared/receipt" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/relayapi/storage/tables" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/relayapi/storage/sqlite3/relay_queue_json_table.go b/relayapi/storage/sqlite3/relay_queue_json_table.go index ac91edb9e..468d9f0c0 100644 --- a/relayapi/storage/sqlite3/relay_queue_json_table.go +++ b/relayapi/storage/sqlite3/relay_queue_json_table.go @@ -12,8 +12,8 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" ) const relayQueueJSONSchema = ` diff --git a/relayapi/storage/sqlite3/relay_queue_table.go b/relayapi/storage/sqlite3/relay_queue_table.go index 3fced1c2e..1d99975a3 100644 --- a/relayapi/storage/sqlite3/relay_queue_table.go +++ b/relayapi/storage/sqlite3/relay_queue_table.go @@ -12,8 +12,8 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/relayapi/storage/sqlite3/storage.go b/relayapi/storage/sqlite3/storage.go index 29dd2504e..7cfd36367 100644 --- a/relayapi/storage/sqlite3/storage.go +++ b/relayapi/storage/sqlite3/storage.go @@ -9,10 +9,10 @@ package sqlite3 import ( "database/sql" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/relayapi/storage/shared" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/relayapi/storage/shared" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/relayapi/storage/storage.go b/relayapi/storage/storage.go index d000df0c6..75ed9757f 100644 --- a/relayapi/storage/storage.go +++ b/relayapi/storage/storage.go @@ -12,11 +12,11 @@ package storage import ( "fmt" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/relayapi/storage/postgres" - "github.com/matrix-org/dendrite/relayapi/storage/sqlite3" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/relayapi/storage/postgres" + "github.com/element-hq/dendrite/relayapi/storage/sqlite3" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/relayapi/storage/storage_wasm.go b/relayapi/storage/storage_wasm.go index d57922fd7..f7992cf67 100644 --- a/relayapi/storage/storage_wasm.go +++ b/relayapi/storage/storage_wasm.go @@ -9,10 +9,10 @@ package storage import ( "fmt" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/relayapi/storage/sqlite3" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/relayapi/storage/sqlite3" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/relayapi/storage/tables/relay_queue_json_table_test.go b/relayapi/storage/tables/relay_queue_json_table_test.go index b60bf55e4..f2c378e46 100644 --- a/relayapi/storage/tables/relay_queue_json_table_test.go +++ b/relayapi/storage/tables/relay_queue_json_table_test.go @@ -12,12 +12,12 @@ import ( "encoding/json" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/relayapi/storage/postgres" - "github.com/matrix-org/dendrite/relayapi/storage/sqlite3" - "github.com/matrix-org/dendrite/relayapi/storage/tables" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/relayapi/storage/postgres" + "github.com/element-hq/dendrite/relayapi/storage/sqlite3" + "github.com/element-hq/dendrite/relayapi/storage/tables" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/stretchr/testify/assert" diff --git a/relayapi/storage/tables/relay_queue_table_test.go b/relayapi/storage/tables/relay_queue_table_test.go index 7d36e6a2a..c3be26438 100644 --- a/relayapi/storage/tables/relay_queue_table_test.go +++ b/relayapi/storage/tables/relay_queue_table_test.go @@ -13,12 +13,12 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/relayapi/storage/postgres" - "github.com/matrix-org/dendrite/relayapi/storage/sqlite3" - "github.com/matrix-org/dendrite/relayapi/storage/tables" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/relayapi/storage/postgres" + "github.com/element-hq/dendrite/relayapi/storage/sqlite3" + "github.com/element-hq/dendrite/relayapi/storage/tables" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/stretchr/testify/assert" diff --git a/roomserver/acls/acls.go b/roomserver/acls/acls.go index 0ff9908ba..199aecaa9 100644 --- a/roomserver/acls/acls.go +++ b/roomserver/acls/acls.go @@ -15,7 +15,7 @@ import ( "strings" "sync" - "github.com/matrix-org/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/storage/tables" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/sirupsen/logrus" diff --git a/roomserver/acls/acls_test.go b/roomserver/acls/acls_test.go index f8b6b67fb..5ae9c84ad 100644 --- a/roomserver/acls/acls_test.go +++ b/roomserver/acls/acls_test.go @@ -11,7 +11,7 @@ import ( "regexp" "testing" - "github.com/matrix-org/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/storage/tables" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/stretchr/testify/assert" diff --git a/roomserver/api/api.go b/roomserver/api/api.go index b2b319244..9493995e1 100644 --- a/roomserver/api/api.go +++ b/roomserver/api/api.go @@ -9,10 +9,10 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" - asAPI "github.com/matrix-org/dendrite/appservice/api" - fsAPI "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/roomserver/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + asAPI "github.com/element-hq/dendrite/appservice/api" + fsAPI "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/roomserver/types" + userapi "github.com/element-hq/dendrite/userapi/api" ) // ErrInvalidID is an error returned if the userID is invalid diff --git a/roomserver/api/input.go b/roomserver/api/input.go index 7cfb57a8c..b687ed098 100644 --- a/roomserver/api/input.go +++ b/roomserver/api/input.go @@ -10,7 +10,7 @@ package api import ( "fmt" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/roomserver/api/output.go b/roomserver/api/output.go index 1c5ff1aa3..f07c59534 100644 --- a/roomserver/api/output.go +++ b/roomserver/api/output.go @@ -7,7 +7,7 @@ package api import ( - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/roomserver/api/perform.go b/roomserver/api/perform.go index d6caec08c..e448dcfa9 100644 --- a/roomserver/api/perform.go +++ b/roomserver/api/perform.go @@ -5,7 +5,7 @@ import ( "encoding/json" "time" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/roomserver/api/query.go b/roomserver/api/query.go index c599ab3d6..1e82c85ee 100644 --- a/roomserver/api/query.go +++ b/roomserver/api/query.go @@ -18,9 +18,9 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/synctypes" ) // QueryLatestEventsAndStateRequest is a request to QueryLatestEventsAndState diff --git a/roomserver/api/wrapper.go b/roomserver/api/wrapper.go index edaeca811..a08901eba 100644 --- a/roomserver/api/wrapper.go +++ b/roomserver/api/wrapper.go @@ -9,7 +9,7 @@ package api import ( "context" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/roomserver/auth/auth.go b/roomserver/auth/auth.go index 5971185c5..bbcd0ab10 100644 --- a/roomserver/auth/auth.go +++ b/roomserver/auth/auth.go @@ -8,7 +8,7 @@ package auth import ( "context" - "github.com/matrix-org/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/roomserver/auth/auth_test.go b/roomserver/auth/auth_test.go index 058361e6e..e935adade 100644 --- a/roomserver/auth/auth_test.go +++ b/roomserver/auth/auth_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/roomserver/internal/alias.go b/roomserver/internal/alias.go index 04f68cf1f..abe2f3a84 100644 --- a/roomserver/internal/alias.go +++ b/roomserver/internal/alias.go @@ -13,11 +13,11 @@ import ( "fmt" "time" - asAPI "github.com/matrix-org/dendrite/appservice/api" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/internal/helpers" - "github.com/matrix-org/dendrite/roomserver/types" + asAPI "github.com/element-hq/dendrite/appservice/api" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/internal/helpers" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/tidwall/gjson" diff --git a/roomserver/internal/api.go b/roomserver/internal/api.go index a71fd2d15..98bdc7d6d 100644 --- a/roomserver/internal/api.go +++ b/roomserver/internal/api.go @@ -12,21 +12,21 @@ import ( "github.com/nats-io/nats.go" "github.com/sirupsen/logrus" - asAPI "github.com/matrix-org/dendrite/appservice/api" - fsAPI "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/roomserver/acls" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/internal/input" - "github.com/matrix-org/dendrite/roomserver/internal/perform" - "github.com/matrix-org/dendrite/roomserver/internal/query" - "github.com/matrix-org/dendrite/roomserver/producers" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - userapi "github.com/matrix-org/dendrite/userapi/api" + asAPI "github.com/element-hq/dendrite/appservice/api" + fsAPI "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/roomserver/acls" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/internal/input" + "github.com/element-hq/dendrite/roomserver/internal/perform" + "github.com/element-hq/dendrite/roomserver/internal/query" + "github.com/element-hq/dendrite/roomserver/producers" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + userapi "github.com/element-hq/dendrite/userapi/api" ) // RoomserverInternalAPI is an implementation of api.RoomserverInternalAPI diff --git a/roomserver/internal/helpers/auth.go b/roomserver/internal/helpers/auth.go index eef893a98..0d0a27449 100644 --- a/roomserver/internal/helpers/auth.go +++ b/roomserver/internal/helpers/auth.go @@ -14,10 +14,10 @@ import ( "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/state" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/state" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/types" ) // CheckForSoftFail returns true if the event should be soft-failed diff --git a/roomserver/internal/helpers/auth_test.go b/roomserver/internal/helpers/auth_test.go index 29f4db2f1..66c9f3c1a 100644 --- a/roomserver/internal/helpers/auth_test.go +++ b/roomserver/internal/helpers/auth_test.go @@ -9,7 +9,7 @@ package helpers import ( "testing" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" ) func benchmarkStateEntryMapLookup(entries, lookups int64, b *testing.B) { diff --git a/roomserver/internal/helpers/helpers.go b/roomserver/internal/helpers/helpers.go index b2e21bf54..8b3be0d70 100644 --- a/roomserver/internal/helpers/helpers.go +++ b/roomserver/internal/helpers/helpers.go @@ -11,13 +11,13 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/auth" - "github.com/matrix-org/dendrite/roomserver/state" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/roomserver/storage/shared" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/auth" + "github.com/element-hq/dendrite/roomserver/state" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/storage/shared" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" ) // TODO: temporary package which has helper functions used by both internal/perform packages. diff --git a/roomserver/internal/helpers/helpers_test.go b/roomserver/internal/helpers/helpers_test.go index 1cef83df7..02f2aa430 100644 --- a/roomserver/internal/helpers/helpers_test.go +++ b/roomserver/internal/helpers/helpers_test.go @@ -5,16 +5,16 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/stretchr/testify/assert" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/test" ) func mustCreateDatabase(t *testing.T, dbType test.DBType) (storage.Database, func()) { diff --git a/roomserver/internal/input/input.go b/roomserver/internal/input/input.go index fe1e1b3d9..053fdcaa0 100644 --- a/roomserver/internal/input/input.go +++ b/roomserver/internal/input/input.go @@ -15,7 +15,7 @@ import ( "sync" "time" - userapi "github.com/matrix-org/dendrite/userapi/api" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" @@ -26,16 +26,16 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - fedapi "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/roomserver/acls" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/internal/query" - "github.com/matrix-org/dendrite/roomserver/producers" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" + fedapi "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/roomserver/acls" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/internal/query" + "github.com/element-hq/dendrite/roomserver/producers" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" ) // Inputer is responsible for consuming from the roomserver input diff --git a/roomserver/internal/input/input_events.go b/roomserver/internal/input/input_events.go index 9d302ee7b..bab5b72a6 100644 --- a/roomserver/internal/input/input_events.go +++ b/roomserver/internal/input/input_events.go @@ -16,7 +16,7 @@ import ( "fmt" "time" - "github.com/matrix-org/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/storage/tables" "github.com/tidwall/gjson" "github.com/matrix-org/gomatrixserverlib" @@ -26,19 +26,19 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/roomserver/acls" - "github.com/matrix-org/dendrite/roomserver/internal/helpers" + "github.com/element-hq/dendrite/roomserver/acls" + "github.com/element-hq/dendrite/roomserver/internal/helpers" - userAPI "github.com/matrix-org/dendrite/userapi/api" + userAPI "github.com/element-hq/dendrite/userapi/api" - fedapi "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/internal/hooks" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/state" - "github.com/matrix-org/dendrite/roomserver/types" + fedapi "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/internal/hooks" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/state" + "github.com/element-hq/dendrite/roomserver/types" ) // MaximumMissingProcessingTime is the maximum time we allow "processRoomEvent" to fetch diff --git a/roomserver/internal/input/input_events_test.go b/roomserver/internal/input/input_events_test.go index 4ee6d2110..05dc842ec 100644 --- a/roomserver/internal/input/input_events_test.go +++ b/roomserver/internal/input/input_events_test.go @@ -6,7 +6,7 @@ import ( "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/test" ) func Test_EventAuth(t *testing.T) { diff --git a/roomserver/internal/input/input_latest_events.go b/roomserver/internal/input/input_latest_events.go index ab9a440d7..8a2973c51 100644 --- a/roomserver/internal/input/input_latest_events.go +++ b/roomserver/internal/input/input_latest_events.go @@ -17,12 +17,12 @@ import ( "github.com/matrix-org/util" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/state" - "github.com/matrix-org/dendrite/roomserver/storage/shared" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/state" + "github.com/element-hq/dendrite/roomserver/storage/shared" + "github.com/element-hq/dendrite/roomserver/types" ) // updateLatestEvents updates the list of latest events for this room in the database and writes the diff --git a/roomserver/internal/input/input_membership.go b/roomserver/internal/input/input_membership.go index 44d58dea1..26295e7d4 100644 --- a/roomserver/internal/input/input_membership.go +++ b/roomserver/internal/input/input_membership.go @@ -12,12 +12,12 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/internal/helpers" - "github.com/matrix-org/dendrite/roomserver/storage/shared" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/internal/helpers" + "github.com/element-hq/dendrite/roomserver/storage/shared" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" ) // updateMembership updates the current membership and the invites for each diff --git a/roomserver/internal/input/input_missing.go b/roomserver/internal/input/input_missing.go index 21493287e..fdc37eeec 100644 --- a/roomserver/internal/input/input_missing.go +++ b/roomserver/internal/input/input_missing.go @@ -13,12 +13,12 @@ import ( "github.com/matrix-org/util" "github.com/sirupsen/logrus" - fedapi "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/state" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/roomserver/types" + fedapi "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/state" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/types" ) type parsedRespState struct { diff --git a/roomserver/internal/input/input_test.go b/roomserver/internal/input/input_test.go index f435181a0..a12f5ecbf 100644 --- a/roomserver/internal/input/input_test.go +++ b/roomserver/internal/input/input_test.go @@ -5,15 +5,15 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/internal/input" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/internal/input" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/roomserver/internal/perform/perform_admin.go b/roomserver/internal/perform/perform_admin.go index eaed4c758..883d558fd 100644 --- a/roomserver/internal/perform/perform_admin.go +++ b/roomserver/internal/perform/perform_admin.go @@ -13,13 +13,13 @@ import ( "fmt" "time" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/internal/input" - "github.com/matrix-org/dendrite/roomserver/internal/query" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/internal/input" + "github.com/element-hq/dendrite/roomserver/internal/query" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/roomserver/internal/perform/perform_backfill.go b/roomserver/internal/perform/perform_backfill.go index c609c6556..41f784ae6 100644 --- a/roomserver/internal/perform/perform_backfill.go +++ b/roomserver/internal/perform/perform_backfill.go @@ -15,13 +15,13 @@ import ( "github.com/matrix-org/util" "github.com/sirupsen/logrus" - federationAPI "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/auth" - "github.com/matrix-org/dendrite/roomserver/internal/helpers" - "github.com/matrix-org/dendrite/roomserver/state" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/roomserver/types" + federationAPI "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/auth" + "github.com/element-hq/dendrite/roomserver/internal/helpers" + "github.com/element-hq/dendrite/roomserver/state" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/types" ) // the max number of servers to backfill from per request. If this is too low we may fail to backfill when diff --git a/roomserver/internal/perform/perform_create_room.go b/roomserver/internal/perform/perform_create_room.go index 301800247..82696e861 100644 --- a/roomserver/internal/perform/perform_create_room.go +++ b/roomserver/internal/perform/perform_create_room.go @@ -14,11 +14,11 @@ import ( "net/http" "github.com/getsentry/sentry-go" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/roomserver/internal/perform/perform_forget.go b/roomserver/internal/perform/perform_forget.go index 297449903..4d14aa5cb 100644 --- a/roomserver/internal/perform/perform_forget.go +++ b/roomserver/internal/perform/perform_forget.go @@ -9,8 +9,8 @@ package perform import ( "context" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/storage" ) type Forgetter struct { diff --git a/roomserver/internal/perform/perform_inbound_peek.go b/roomserver/internal/perform/perform_inbound_peek.go index 78aefce8a..f966b5b4f 100644 --- a/roomserver/internal/perform/perform_inbound_peek.go +++ b/roomserver/internal/perform/perform_inbound_peek.go @@ -8,13 +8,13 @@ package perform import ( "context" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/internal/helpers" - "github.com/matrix-org/dendrite/roomserver/internal/input" - "github.com/matrix-org/dendrite/roomserver/internal/query" - "github.com/matrix-org/dendrite/roomserver/state" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/internal/helpers" + "github.com/element-hq/dendrite/roomserver/internal/input" + "github.com/element-hq/dendrite/roomserver/internal/query" + "github.com/element-hq/dendrite/roomserver/state" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" ) diff --git a/roomserver/internal/perform/perform_invite.go b/roomserver/internal/perform/perform_invite.go index cda107993..fee865ad7 100644 --- a/roomserver/internal/perform/perform_invite.go +++ b/roomserver/internal/perform/perform_invite.go @@ -11,15 +11,15 @@ import ( "crypto/ed25519" "fmt" - federationAPI "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/internal/helpers" - "github.com/matrix-org/dendrite/roomserver/internal/input" - "github.com/matrix-org/dendrite/roomserver/state" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/roomserver/storage/shared" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" + federationAPI "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/internal/helpers" + "github.com/element-hq/dendrite/roomserver/internal/input" + "github.com/element-hq/dendrite/roomserver/state" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/storage/shared" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/roomserver/internal/perform/perform_join.go b/roomserver/internal/perform/perform_join.go index 79aa4e143..7f4ce7f40 100644 --- a/roomserver/internal/perform/perform_join.go +++ b/roomserver/internal/perform/perform_join.go @@ -23,16 +23,16 @@ import ( "github.com/sirupsen/logrus" "github.com/tidwall/gjson" - fsAPI "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/roomserver/api" - rsAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/internal/helpers" - "github.com/matrix-org/dendrite/roomserver/internal/input" - "github.com/matrix-org/dendrite/roomserver/internal/query" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" + fsAPI "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/roomserver/api" + rsAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/internal/helpers" + "github.com/element-hq/dendrite/roomserver/internal/input" + "github.com/element-hq/dendrite/roomserver/internal/query" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" ) type Joiner struct { diff --git a/roomserver/internal/perform/perform_leave.go b/roomserver/internal/perform/perform_leave.go index 738223fa4..a39f80a64 100644 --- a/roomserver/internal/perform/perform_leave.go +++ b/roomserver/internal/perform/perform_leave.go @@ -13,21 +13,21 @@ import ( "strings" "time" - "github.com/matrix-org/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/internal/eventutil" "github.com/matrix-org/gomatrix" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" "github.com/sirupsen/logrus" - fsAPI "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/roomserver/api" - rsAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/internal/helpers" - "github.com/matrix-org/dendrite/roomserver/internal/input" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/setup/config" - userapi "github.com/matrix-org/dendrite/userapi/api" + fsAPI "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/roomserver/api" + rsAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/internal/helpers" + "github.com/element-hq/dendrite/roomserver/internal/input" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/setup/config" + userapi "github.com/element-hq/dendrite/userapi/api" ) type Leaver struct { diff --git a/roomserver/internal/perform/perform_peek.go b/roomserver/internal/perform/perform_peek.go index d124c9c37..6a76a2890 100644 --- a/roomserver/internal/perform/perform_peek.go +++ b/roomserver/internal/perform/perform_peek.go @@ -11,11 +11,11 @@ import ( "fmt" "strings" - fsAPI "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/internal/input" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/setup/config" + fsAPI "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/internal/input" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/roomserver/internal/perform/perform_publish.go b/roomserver/internal/perform/perform_publish.go index baf1da87e..58453d270 100644 --- a/roomserver/internal/perform/perform_publish.go +++ b/roomserver/internal/perform/perform_publish.go @@ -9,8 +9,8 @@ package perform import ( "context" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/storage" ) type Publisher struct { diff --git a/roomserver/internal/perform/perform_unpeek.go b/roomserver/internal/perform/perform_unpeek.go index 55b6437ef..99a9b8fa7 100644 --- a/roomserver/internal/perform/perform_unpeek.go +++ b/roomserver/internal/perform/perform_unpeek.go @@ -10,10 +10,10 @@ import ( "fmt" "strings" - fsAPI "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/internal/input" - "github.com/matrix-org/dendrite/setup/config" + fsAPI "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/internal/input" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/roomserver/internal/perform/perform_upgrade.go b/roomserver/internal/perform/perform_upgrade.go index 63283b8b3..707c49eb1 100644 --- a/roomserver/internal/perform/perform_upgrade.go +++ b/roomserver/internal/perform/perform_upgrade.go @@ -12,10 +12,10 @@ import ( "fmt" "time" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go index 74a8c739d..98ff7d415 100644 --- a/roomserver/internal/query/query.go +++ b/roomserver/internal/query/query.go @@ -13,25 +13,25 @@ import ( "errors" "fmt" - //"github.com/matrix-org/dendrite/roomserver/internal" - "github.com/matrix-org/dendrite/setup/config" + //"github.com/element-hq/dendrite/roomserver/internal" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/syncapi/synctypes" - - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - fsAPI "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/roomserver/acls" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/internal/helpers" - "github.com/matrix-org/dendrite/roomserver/state" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/syncapi/synctypes" + + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + fsAPI "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/roomserver/acls" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/internal/helpers" + "github.com/element-hq/dendrite/roomserver/state" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/types" ) type Queryer struct { diff --git a/roomserver/internal/query/query_room_hierarchy.go b/roomserver/internal/query/query_room_hierarchy.go index ab57e5c49..2df2042ee 100644 --- a/roomserver/internal/query/query_room_hierarchy.go +++ b/roomserver/internal/query/query_room_hierarchy.go @@ -13,10 +13,10 @@ import ( "fmt" "sort" - fs "github.com/matrix-org/dendrite/federationapi/api" - roomserver "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + fs "github.com/element-hq/dendrite/federationapi/api" + roomserver "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/roomserver/internal/query/query_test.go b/roomserver/internal/query/query_test.go index a1cfd464f..d57484697 100644 --- a/roomserver/internal/query/query_test.go +++ b/roomserver/internal/query/query_test.go @@ -12,12 +12,12 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/roomserver/producers/roomevent.go b/roomserver/producers/roomevent.go index bec92bb2a..be2adffa2 100644 --- a/roomserver/producers/roomevent.go +++ b/roomserver/producers/roomevent.go @@ -9,14 +9,14 @@ package producers import ( "encoding/json" - "github.com/matrix-org/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/storage/tables" "github.com/nats-io/nats.go" log "github.com/sirupsen/logrus" "github.com/tidwall/gjson" - "github.com/matrix-org/dendrite/roomserver/acls" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/roomserver/acls" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/jetstream" ) var keyContentFields = map[string]string{ diff --git a/roomserver/roomserver.go b/roomserver/roomserver.go index da45aa716..757637d36 100644 --- a/roomserver/roomserver.go +++ b/roomserver/roomserver.go @@ -7,16 +7,16 @@ package roomserver import ( - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/internal" - "github.com/matrix-org/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/internal" + "github.com/element-hq/dendrite/roomserver/storage" ) // NewInternalAPI returns a concrete implementation of the internal API. diff --git a/roomserver/roomserver_test.go b/roomserver/roomserver_test.go index 85312efd9..48911d2bb 100644 --- a/roomserver/roomserver_test.go +++ b/roomserver/roomserver_test.go @@ -7,35 +7,35 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/federationapi/statistics" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/internal/input" + "github.com/element-hq/dendrite/federationapi/statistics" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/internal/input" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/tidwall/gjson" - "github.com/matrix-org/dendrite/roomserver/acls" - "github.com/matrix-org/dendrite/roomserver/state" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/userapi" + "github.com/element-hq/dendrite/roomserver/acls" + "github.com/element-hq/dendrite/roomserver/state" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/userapi" - userAPI "github.com/matrix-org/dendrite/userapi/api" + userAPI "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" - "github.com/matrix-org/dendrite/federationapi" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/syncapi" + "github.com/element-hq/dendrite/federationapi" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/syncapi" - "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" + "github.com/element-hq/dendrite/roomserver" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/storage" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" ) var testIsBlacklistedOrBackingOff = func(s spec.ServerName) (*statistics.ServerStatistics, error) { @@ -1017,7 +1017,7 @@ func TestUpgrade(t *testing.T) { validateFunc: validate, }, { - name: "custom state is not taken to the new room", // https://github.com/matrix-org/dendrite/issues/2912 + name: "custom state is not taken to the new room", // https://github.com/element-hq/dendrite/issues/2912 upgradeUser: charlie.ID, roomFunc: func(rsAPI api.RoomserverInternalAPI) string { r := test.NewRoom(t, alice, test.RoomVersion(gomatrixserverlib.RoomVersionV6)) diff --git a/roomserver/state/state.go b/roomserver/state/state.go index 6f236868a..1d3cba277 100644 --- a/roomserver/state/state.go +++ b/roomserver/state/state.go @@ -20,9 +20,9 @@ import ( "github.com/matrix-org/util" "github.com/prometheus/client_golang/prometheus" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" ) type StateResolutionStorage interface { diff --git a/roomserver/state/state_test.go b/roomserver/state/state_test.go index 27197576b..774bb4c21 100644 --- a/roomserver/state/state_test.go +++ b/roomserver/state/state_test.go @@ -11,7 +11,7 @@ package state import ( "testing" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" ) func TestFindDuplicateStateKeys(t *testing.T) { diff --git a/roomserver/storage/interface.go b/roomserver/storage/interface.go index 5cbca3a5b..b560d7d3b 100644 --- a/roomserver/storage/interface.go +++ b/roomserver/storage/interface.go @@ -10,14 +10,14 @@ import ( "context" "crypto/ed25519" - "github.com/matrix-org/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/roomserver/state" - "github.com/matrix-org/dendrite/roomserver/storage/shared" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/state" + "github.com/element-hq/dendrite/roomserver/storage/shared" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" ) type Database interface { diff --git a/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go b/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go index eb7b27abf..504a0554c 100644 --- a/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go +++ b/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go @@ -12,7 +12,7 @@ import ( "fmt" "github.com/lib/pq" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/util" "github.com/sirupsen/logrus" ) diff --git a/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha.go b/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha.go index 5951846f1..e597be6ac 100644 --- a/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha.go +++ b/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha.go @@ -12,7 +12,7 @@ import ( "fmt" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" + "github.com/element-hq/dendrite/internal" "github.com/matrix-org/util" ) diff --git a/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha_test.go b/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha_test.go index c79daac5f..7a5a029ab 100644 --- a/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha_test.go +++ b/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" "github.com/stretchr/testify/assert" ) diff --git a/roomserver/storage/postgres/event_json_table.go b/roomserver/storage/postgres/event_json_table.go index 92ca30bb5..d90a8a764 100644 --- a/roomserver/storage/postgres/event_json_table.go +++ b/roomserver/storage/postgres/event_json_table.go @@ -11,10 +11,10 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" ) const eventJSONSchema = ` diff --git a/roomserver/storage/postgres/event_state_keys_table.go b/roomserver/storage/postgres/event_state_keys_table.go index 4ac3ff827..2b2708156 100644 --- a/roomserver/storage/postgres/event_state_keys_table.go +++ b/roomserver/storage/postgres/event_state_keys_table.go @@ -12,10 +12,10 @@ import ( "database/sql" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" ) const eventStateKeysSchema = ` diff --git a/roomserver/storage/postgres/event_types_table.go b/roomserver/storage/postgres/event_types_table.go index d9b41b3bf..e85e9e9b9 100644 --- a/roomserver/storage/postgres/event_types_table.go +++ b/roomserver/storage/postgres/event_types_table.go @@ -12,10 +12,10 @@ import ( "database/sql" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" ) const eventTypesSchema = ` diff --git a/roomserver/storage/postgres/events_table.go b/roomserver/storage/postgres/events_table.go index 7bd1f8f36..0b5c0c50c 100644 --- a/roomserver/storage/postgres/events_table.go +++ b/roomserver/storage/postgres/events_table.go @@ -14,11 +14,11 @@ import ( "sort" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres/deltas" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres/deltas" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" ) const eventsSchema = ` diff --git a/roomserver/storage/postgres/invite_table.go b/roomserver/storage/postgres/invite_table.go index 8f2a0f5f1..2c5940cac 100644 --- a/roomserver/storage/postgres/invite_table.go +++ b/roomserver/storage/postgres/invite_table.go @@ -11,10 +11,10 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" ) const inviteSchema = ` diff --git a/roomserver/storage/postgres/membership_table.go b/roomserver/storage/postgres/membership_table.go index ebb12e0e4..4a743d32f 100644 --- a/roomserver/storage/postgres/membership_table.go +++ b/roomserver/storage/postgres/membership_table.go @@ -14,11 +14,11 @@ import ( "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres/deltas" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres/deltas" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/roomserver/storage/postgres/previous_events_table.go b/roomserver/storage/postgres/previous_events_table.go index 34dfe4417..99018c3a5 100644 --- a/roomserver/storage/postgres/previous_events_table.go +++ b/roomserver/storage/postgres/previous_events_table.go @@ -11,10 +11,10 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres/deltas" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres/deltas" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" ) const previousEventSchema = ` diff --git a/roomserver/storage/postgres/published_table.go b/roomserver/storage/postgres/published_table.go index 39ca89a7a..490f0e9cb 100644 --- a/roomserver/storage/postgres/published_table.go +++ b/roomserver/storage/postgres/published_table.go @@ -10,10 +10,10 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres/deltas" - "github.com/matrix-org/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres/deltas" + "github.com/element-hq/dendrite/roomserver/storage/tables" ) const publishedSchema = ` diff --git a/roomserver/storage/postgres/purge_statements.go b/roomserver/storage/postgres/purge_statements.go index 8e15cd857..49ac2df27 100644 --- a/roomserver/storage/postgres/purge_statements.go +++ b/roomserver/storage/postgres/purge_statements.go @@ -10,8 +10,8 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/types" ) const purgeEventJSONSQL = "" + diff --git a/roomserver/storage/postgres/redactions_table.go b/roomserver/storage/postgres/redactions_table.go index e01b53eea..fe8ad975e 100644 --- a/roomserver/storage/postgres/redactions_table.go +++ b/roomserver/storage/postgres/redactions_table.go @@ -10,8 +10,8 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" ) const redactionsSchema = ` diff --git a/roomserver/storage/postgres/reported_events_table.go b/roomserver/storage/postgres/reported_events_table.go index 956141e15..448a99798 100644 --- a/roomserver/storage/postgres/reported_events_table.go +++ b/roomserver/storage/postgres/reported_events_table.go @@ -11,11 +11,11 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/roomserver/storage/postgres/room_aliases_table.go b/roomserver/storage/postgres/room_aliases_table.go index ebac3c62d..db67a920a 100644 --- a/roomserver/storage/postgres/room_aliases_table.go +++ b/roomserver/storage/postgres/room_aliases_table.go @@ -11,9 +11,9 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" ) const roomAliasesSchema = ` diff --git a/roomserver/storage/postgres/rooms_table.go b/roomserver/storage/postgres/rooms_table.go index 62d0bb82f..327c445c8 100644 --- a/roomserver/storage/postgres/rooms_table.go +++ b/roomserver/storage/postgres/rooms_table.go @@ -12,10 +12,10 @@ import ( "database/sql" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/roomserver/storage/postgres/state_block_table.go b/roomserver/storage/postgres/state_block_table.go index 3845d4160..bb9454a7e 100644 --- a/roomserver/storage/postgres/state_block_table.go +++ b/roomserver/storage/postgres/state_block_table.go @@ -13,10 +13,10 @@ import ( "fmt" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/util" ) diff --git a/roomserver/storage/postgres/state_snapshot_table.go b/roomserver/storage/postgres/state_snapshot_table.go index 9ec86ead3..178aba376 100644 --- a/roomserver/storage/postgres/state_snapshot_table.go +++ b/roomserver/storage/postgres/state_snapshot_table.go @@ -16,8 +16,8 @@ import ( "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/types" ) const stateSnapshotSchema = ` @@ -71,8 +71,8 @@ const bulkSelectStateBlockNIDsSQL = "" + // TODO: There's a sequence scan here because of the hash join strategy, which is // probably O(n) on state key entries, so there must be a way to avoid that somehow. // Event type NIDs are: -// - 5: m.room.member as per https://github.com/matrix-org/dendrite/blob/c7f7aec4d07d59120d37d5b16a900f6d608a75c4/roomserver/storage/postgres/event_types_table.go#L40 -// - 7: m.room.history_visibility as per https://github.com/matrix-org/dendrite/blob/c7f7aec4d07d59120d37d5b16a900f6d608a75c4/roomserver/storage/postgres/event_types_table.go#L42 +// - 5: m.room.member as per https://github.com/element-hq/dendrite/blob/c7f7aec4d07d59120d37d5b16a900f6d608a75c4/roomserver/storage/postgres/event_types_table.go#L40 +// - 7: m.room.history_visibility as per https://github.com/element-hq/dendrite/blob/c7f7aec4d07d59120d37d5b16a900f6d608a75c4/roomserver/storage/postgres/event_types_table.go#L42 const bulkSelectStateForHistoryVisibilitySQL = ` SELECT event_nid FROM ( SELECT event_nid, event_type_nid, event_state_key_nid FROM roomserver_events diff --git a/roomserver/storage/postgres/storage.go b/roomserver/storage/postgres/storage.go index 333067fc2..85308e9c5 100644 --- a/roomserver/storage/postgres/storage.go +++ b/roomserver/storage/postgres/storage.go @@ -16,11 +16,11 @@ import ( // Import the postgres database driver. _ "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres/deltas" - "github.com/matrix-org/dendrite/roomserver/storage/shared" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres/deltas" + "github.com/element-hq/dendrite/roomserver/storage/shared" + "github.com/element-hq/dendrite/setup/config" ) // A Database is used to store room events and stream offsets. diff --git a/roomserver/storage/postgres/user_room_keys_table.go b/roomserver/storage/postgres/user_room_keys_table.go index b223540cb..e8b158fc2 100644 --- a/roomserver/storage/postgres/user_room_keys_table.go +++ b/roomserver/storage/postgres/user_room_keys_table.go @@ -13,10 +13,10 @@ import ( "errors" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/roomserver/storage/shared/membership_updater.go b/roomserver/storage/shared/membership_updater.go index a96e87072..62b72ca6c 100644 --- a/roomserver/storage/shared/membership_updater.go +++ b/roomserver/storage/shared/membership_updater.go @@ -5,8 +5,8 @@ import ( "database/sql" "fmt" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/roomserver/storage/shared/room_updater.go b/roomserver/storage/shared/room_updater.go index 06284d2e3..e580d9ab8 100644 --- a/roomserver/storage/shared/room_updater.go +++ b/roomserver/storage/shared/room_updater.go @@ -7,7 +7,7 @@ import ( "github.com/matrix-org/gomatrixserverlib" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" ) type RoomUpdater struct { diff --git a/roomserver/storage/shared/storage.go b/roomserver/storage/shared/storage.go index 7b04641bf..a4eb0eb9b 100644 --- a/roomserver/storage/shared/storage.go +++ b/roomserver/storage/shared/storage.go @@ -9,19 +9,19 @@ import ( "fmt" "sort" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/roomserver/api" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/roomserver/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" "github.com/sirupsen/logrus" "github.com/tidwall/gjson" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/state" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/state" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" ) // Ideally, when we have both events we should redact the event JSON and forget about the redaction, but we currently diff --git a/roomserver/storage/shared/storage_test.go b/roomserver/storage/shared/storage_test.go index 612e4ef06..c55aa48b7 100644 --- a/roomserver/storage/shared/storage_test.go +++ b/roomserver/storage/shared/storage_test.go @@ -6,20 +6,20 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/stretchr/testify/assert" ed255192 "golang.org/x/crypto/ed25519" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres" - "github.com/matrix-org/dendrite/roomserver/storage/shared" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres" + "github.com/element-hq/dendrite/roomserver/storage/shared" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" ) func mustCreateRoomserverDatabase(t *testing.T, dbType test.DBType) (*shared.Database, func()) { diff --git a/roomserver/storage/sqlite3/deltas/2021041615092700_state_blocks_refactor.go b/roomserver/storage/sqlite3/deltas/2021041615092700_state_blocks_refactor.go index ff0cd354a..d8a8c4eb5 100644 --- a/roomserver/storage/sqlite3/deltas/2021041615092700_state_blocks_refactor.go +++ b/roomserver/storage/sqlite3/deltas/2021041615092700_state_blocks_refactor.go @@ -12,8 +12,8 @@ import ( "encoding/json" "fmt" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/util" "github.com/sirupsen/logrus" ) diff --git a/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha.go b/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha.go index 2673d2433..852962392 100644 --- a/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha.go +++ b/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha.go @@ -12,7 +12,7 @@ import ( "fmt" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" + "github.com/element-hq/dendrite/internal" "github.com/matrix-org/util" ) diff --git a/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha_test.go b/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha_test.go index 547d9703b..962757d26 100644 --- a/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha_test.go +++ b/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha_test.go @@ -3,9 +3,9 @@ package deltas import ( "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" "github.com/stretchr/testify/assert" ) diff --git a/roomserver/storage/sqlite3/event_json_table.go b/roomserver/storage/sqlite3/event_json_table.go index 510567152..68800bdf4 100644 --- a/roomserver/storage/sqlite3/event_json_table.go +++ b/roomserver/storage/sqlite3/event_json_table.go @@ -12,10 +12,10 @@ import ( "database/sql" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" ) const eventJSONSchema = ` diff --git a/roomserver/storage/sqlite3/event_state_keys_table.go b/roomserver/storage/sqlite3/event_state_keys_table.go index 83485d1f4..a47ffca0c 100644 --- a/roomserver/storage/sqlite3/event_state_keys_table.go +++ b/roomserver/storage/sqlite3/event_state_keys_table.go @@ -13,10 +13,10 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" ) const eventStateKeysSchema = ` diff --git a/roomserver/storage/sqlite3/event_types_table.go b/roomserver/storage/sqlite3/event_types_table.go index 15d151148..323c0ca9f 100644 --- a/roomserver/storage/sqlite3/event_types_table.go +++ b/roomserver/storage/sqlite3/event_types_table.go @@ -13,10 +13,10 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" ) const eventTypesSchema = ` diff --git a/roomserver/storage/sqlite3/events_table.go b/roomserver/storage/sqlite3/events_table.go index ad30e277e..0090abb52 100644 --- a/roomserver/storage/sqlite3/events_table.go +++ b/roomserver/storage/sqlite3/events_table.go @@ -16,11 +16,11 @@ import ( "sort" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3/deltas" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" ) const eventsSchema = ` diff --git a/roomserver/storage/sqlite3/invite_table.go b/roomserver/storage/sqlite3/invite_table.go index 73105ddaf..5618d0cb7 100644 --- a/roomserver/storage/sqlite3/invite_table.go +++ b/roomserver/storage/sqlite3/invite_table.go @@ -11,10 +11,10 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" ) const inviteSchema = ` diff --git a/roomserver/storage/sqlite3/membership_table.go b/roomserver/storage/sqlite3/membership_table.go index fecbd2b96..0b6a4f2a9 100644 --- a/roomserver/storage/sqlite3/membership_table.go +++ b/roomserver/storage/sqlite3/membership_table.go @@ -13,11 +13,11 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3/deltas" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/roomserver/storage/sqlite3/previous_events_table.go b/roomserver/storage/sqlite3/previous_events_table.go index 1bb7fbd03..6f88d7b32 100644 --- a/roomserver/storage/sqlite3/previous_events_table.go +++ b/roomserver/storage/sqlite3/previous_events_table.go @@ -14,10 +14,10 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3/deltas" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" ) // TODO: previous_reference_sha256 was NOT NULL before but it broke sytest because diff --git a/roomserver/storage/sqlite3/published_table.go b/roomserver/storage/sqlite3/published_table.go index 7d712f307..cff1afac1 100644 --- a/roomserver/storage/sqlite3/published_table.go +++ b/roomserver/storage/sqlite3/published_table.go @@ -10,10 +10,10 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3/deltas" - "github.com/matrix-org/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/roomserver/storage/tables" ) const publishedSchema = ` diff --git a/roomserver/storage/sqlite3/purge_statements.go b/roomserver/storage/sqlite3/purge_statements.go index f0967a446..cef035bcb 100644 --- a/roomserver/storage/sqlite3/purge_statements.go +++ b/roomserver/storage/sqlite3/purge_statements.go @@ -10,8 +10,8 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/types" ) const purgeEventJSONSQL = "" + diff --git a/roomserver/storage/sqlite3/redactions_table.go b/roomserver/storage/sqlite3/redactions_table.go index faf586c36..8415a027d 100644 --- a/roomserver/storage/sqlite3/redactions_table.go +++ b/roomserver/storage/sqlite3/redactions_table.go @@ -10,8 +10,8 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" ) const redactionsSchema = ` diff --git a/roomserver/storage/sqlite3/reported_events_table.go b/roomserver/storage/sqlite3/reported_events_table.go index 70029d57b..e0085ff42 100644 --- a/roomserver/storage/sqlite3/reported_events_table.go +++ b/roomserver/storage/sqlite3/reported_events_table.go @@ -11,11 +11,11 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/roomserver/storage/sqlite3/room_aliases_table.go b/roomserver/storage/sqlite3/room_aliases_table.go index 7f6ea6eda..67e645235 100644 --- a/roomserver/storage/sqlite3/room_aliases_table.go +++ b/roomserver/storage/sqlite3/room_aliases_table.go @@ -11,9 +11,9 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" ) const roomAliasesSchema = ` diff --git a/roomserver/storage/sqlite3/rooms_table.go b/roomserver/storage/sqlite3/rooms_table.go index cd1af3b88..414cd9252 100644 --- a/roomserver/storage/sqlite3/rooms_table.go +++ b/roomserver/storage/sqlite3/rooms_table.go @@ -14,10 +14,10 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/roomserver/storage/sqlite3/state_block_table.go b/roomserver/storage/sqlite3/state_block_table.go index f9f09f646..5c37d691a 100644 --- a/roomserver/storage/sqlite3/state_block_table.go +++ b/roomserver/storage/sqlite3/state_block_table.go @@ -14,9 +14,9 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/util" ) diff --git a/roomserver/storage/sqlite3/state_snapshot_table.go b/roomserver/storage/sqlite3/state_snapshot_table.go index 4eba014a6..6b2ec70ab 100644 --- a/roomserver/storage/sqlite3/state_snapshot_table.go +++ b/roomserver/storage/sqlite3/state_snapshot_table.go @@ -14,10 +14,10 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/util" ) diff --git a/roomserver/storage/sqlite3/storage.go b/roomserver/storage/sqlite3/storage.go index 7b117caa5..f108d6731 100644 --- a/roomserver/storage/sqlite3/storage.go +++ b/roomserver/storage/sqlite3/storage.go @@ -13,12 +13,12 @@ import ( "errors" "fmt" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/shared" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3/deltas" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/shared" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/roomserver/storage/sqlite3/user_room_keys_table.go b/roomserver/storage/sqlite3/user_room_keys_table.go index c9189b7a2..f628300f2 100644 --- a/roomserver/storage/sqlite3/user_room_keys_table.go +++ b/roomserver/storage/sqlite3/user_room_keys_table.go @@ -13,10 +13,10 @@ import ( "errors" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/roomserver/storage/storage.go b/roomserver/storage/storage.go index ac7be9afa..490abd200 100644 --- a/roomserver/storage/storage.go +++ b/roomserver/storage/storage.go @@ -13,11 +13,11 @@ import ( "context" "fmt" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/setup/config" ) // Open opens a database connection. diff --git a/roomserver/storage/storage_wasm.go b/roomserver/storage/storage_wasm.go index 78b18040a..cd4280963 100644 --- a/roomserver/storage/storage_wasm.go +++ b/roomserver/storage/storage_wasm.go @@ -10,10 +10,10 @@ import ( "context" "fmt" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/setup/config" ) // NewPublicRoomsServerDatabase opens a database connection. diff --git a/roomserver/storage/tables/event_json_table_test.go b/roomserver/storage/tables/event_json_table_test.go index b490d0fe8..610299f71 100644 --- a/roomserver/storage/tables/event_json_table_test.go +++ b/roomserver/storage/tables/event_json_table_test.go @@ -5,13 +5,13 @@ import ( "fmt" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/stretchr/testify/assert" ) diff --git a/roomserver/storage/tables/event_state_keys_table_test.go b/roomserver/storage/tables/event_state_keys_table_test.go index a856fe551..58e41ff41 100644 --- a/roomserver/storage/tables/event_state_keys_table_test.go +++ b/roomserver/storage/tables/event_state_keys_table_test.go @@ -5,13 +5,13 @@ import ( "fmt" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/stretchr/testify/assert" ) diff --git a/roomserver/storage/tables/event_types_table_test.go b/roomserver/storage/tables/event_types_table_test.go index 92c57a917..c1a97c9f4 100644 --- a/roomserver/storage/tables/event_types_table_test.go +++ b/roomserver/storage/tables/event_types_table_test.go @@ -5,13 +5,13 @@ import ( "fmt" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/stretchr/testify/assert" ) diff --git a/roomserver/storage/tables/events_table_test.go b/roomserver/storage/tables/events_table_test.go index 52aeacc2f..a9e61c8e2 100644 --- a/roomserver/storage/tables/events_table_test.go +++ b/roomserver/storage/tables/events_table_test.go @@ -5,13 +5,13 @@ import ( "fmt" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/stretchr/testify/assert" ) diff --git a/roomserver/storage/tables/interface.go b/roomserver/storage/tables/interface.go index 02f6992c4..0c311c1e6 100644 --- a/roomserver/storage/tables/interface.go +++ b/roomserver/storage/tables/interface.go @@ -6,12 +6,12 @@ import ( "database/sql" "errors" - "github.com/matrix-org/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/tidwall/gjson" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" ) var OptimisationNotSupportedError = errors.New("optimisation not supported") diff --git a/roomserver/storage/tables/interface_test.go b/roomserver/storage/tables/interface_test.go index 8727e2436..20707c5d7 100644 --- a/roomserver/storage/tables/interface_test.go +++ b/roomserver/storage/tables/interface_test.go @@ -3,8 +3,8 @@ package tables import ( "testing" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/stretchr/testify/assert" ) diff --git a/roomserver/storage/tables/invite_table_test.go b/roomserver/storage/tables/invite_table_test.go index e3eedbf14..8bec1fcc1 100644 --- a/roomserver/storage/tables/invite_table_test.go +++ b/roomserver/storage/tables/invite_table_test.go @@ -7,13 +7,13 @@ import ( "github.com/matrix-org/util" "github.com/stretchr/testify/assert" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" ) func mustCreateInviteTable(t *testing.T, dbType test.DBType) (tables.Invites, func()) { diff --git a/roomserver/storage/tables/membership_table_test.go b/roomserver/storage/tables/membership_table_test.go index c4524ee44..8d7854020 100644 --- a/roomserver/storage/tables/membership_table_test.go +++ b/roomserver/storage/tables/membership_table_test.go @@ -5,13 +5,13 @@ import ( "fmt" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/stretchr/testify/assert" ) diff --git a/roomserver/storage/tables/previous_events_table_test.go b/roomserver/storage/tables/previous_events_table_test.go index 9d41e90be..6a70f1a62 100644 --- a/roomserver/storage/tables/previous_events_table_test.go +++ b/roomserver/storage/tables/previous_events_table_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/util" "github.com/stretchr/testify/assert" ) diff --git a/roomserver/storage/tables/published_table_test.go b/roomserver/storage/tables/published_table_test.go index e6289e9b1..5615f3715 100644 --- a/roomserver/storage/tables/published_table_test.go +++ b/roomserver/storage/tables/published_table_test.go @@ -8,12 +8,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" ) func mustCreatePublishedTable(t *testing.T, dbType test.DBType) (tab tables.Published, close func()) { diff --git a/roomserver/storage/tables/redactions_table_test.go b/roomserver/storage/tables/redactions_table_test.go index ea48dc22f..ce35de669 100644 --- a/roomserver/storage/tables/redactions_table_test.go +++ b/roomserver/storage/tables/redactions_table_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/util" "github.com/stretchr/testify/assert" ) diff --git a/roomserver/storage/tables/room_aliases_table_test.go b/roomserver/storage/tables/room_aliases_table_test.go index 624d92ae6..6ca778d4c 100644 --- a/roomserver/storage/tables/room_aliases_table_test.go +++ b/roomserver/storage/tables/room_aliases_table_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/stretchr/testify/assert" ) diff --git a/roomserver/storage/tables/rooms_table_test.go b/roomserver/storage/tables/rooms_table_test.go index e97e3e339..9db915cd8 100644 --- a/roomserver/storage/tables/rooms_table_test.go +++ b/roomserver/storage/tables/rooms_table_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/util" "github.com/stretchr/testify/assert" ) diff --git a/roomserver/storage/tables/state_block_table_test.go b/roomserver/storage/tables/state_block_table_test.go index de0b420bc..241cda439 100644 --- a/roomserver/storage/tables/state_block_table_test.go +++ b/roomserver/storage/tables/state_block_table_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/stretchr/testify/assert" ) diff --git a/roomserver/storage/tables/state_snapshot_table_test.go b/roomserver/storage/tables/state_snapshot_table_test.go index c7c991b20..7d84c1b4b 100644 --- a/roomserver/storage/tables/state_snapshot_table_test.go +++ b/roomserver/storage/tables/state_snapshot_table_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/stretchr/testify/assert" ) diff --git a/roomserver/storage/tables/user_room_keys_table_test.go b/roomserver/storage/tables/user_room_keys_table_test.go index 2809771b4..bb0ba2713 100644 --- a/roomserver/storage/tables/user_room_keys_table_test.go +++ b/roomserver/storage/tables/user_room_keys_table_test.go @@ -6,13 +6,13 @@ import ( "database/sql" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/storage/postgres" - "github.com/matrix-org/dendrite/roomserver/storage/sqlite3" - "github.com/matrix-org/dendrite/roomserver/storage/tables" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/storage/postgres" + "github.com/element-hq/dendrite/roomserver/storage/sqlite3" + "github.com/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/stretchr/testify/assert" ed255192 "golang.org/x/crypto/ed25519" diff --git a/roomserver/types/types.go b/roomserver/types/types.go index 39340c5ba..0256cdd9f 100644 --- a/roomserver/types/types.go +++ b/roomserver/types/types.go @@ -14,7 +14,7 @@ import ( "strings" "sync" - userapi "github.com/matrix-org/dendrite/userapi/api" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/setup/base/base.go b/setup/base/base.go index 2c6704bd3..ee2e5cadd 100644 --- a/setup/base/base.go +++ b/setup/base/base.go @@ -30,13 +30,13 @@ import ( "github.com/gorilla/mux" "github.com/kardianos/minwinsvc" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/httputil" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/process" ) //go:embed static/*.gotmpl diff --git a/setup/base/base_test.go b/setup/base/base_test.go index bba967b94..72f8b239e 100644 --- a/setup/base/base_test.go +++ b/setup/base/base_test.go @@ -12,11 +12,11 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/httputil" - basepkg "github.com/matrix-org/dendrite/setup/base" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/httputil" + basepkg "github.com/element-hq/dendrite/setup/base" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/process" "github.com/stretchr/testify/assert" ) diff --git a/setup/config/config.go b/setup/config/config.go index cd785f4b5..1dd7cfc64 100644 --- a/setup/config/config.go +++ b/setup/config/config.go @@ -16,7 +16,7 @@ import ( "regexp" "strings" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/sirupsen/logrus" diff --git a/setup/flags.go b/setup/flags.go index 724b4b004..75d2332b9 100644 --- a/setup/flags.go +++ b/setup/flags.go @@ -11,8 +11,8 @@ import ( "fmt" "os" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/setup/config" "github.com/sirupsen/logrus" ) diff --git a/setup/jetstream/nats.go b/setup/jetstream/nats.go index 09048cc94..cc896f8ee 100644 --- a/setup/jetstream/nats.go +++ b/setup/jetstream/nats.go @@ -11,8 +11,8 @@ import ( "github.com/getsentry/sentry-go" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/process" natsserver "github.com/nats-io/nats-server/v2/server" natsclient "github.com/nats-io/nats.go" diff --git a/setup/monolith.go b/setup/monolith.go index c73b02951..1b8b35f17 100644 --- a/setup/monolith.go +++ b/setup/monolith.go @@ -7,24 +7,24 @@ package setup import ( - appserviceAPI "github.com/matrix-org/dendrite/appservice/api" - "github.com/matrix-org/dendrite/clientapi" - "github.com/matrix-org/dendrite/clientapi/api" - "github.com/matrix-org/dendrite/federationapi" - federationAPI "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/internal/transactions" - "github.com/matrix-org/dendrite/mediaapi" - "github.com/matrix-org/dendrite/relayapi" - relayAPI "github.com/matrix-org/dendrite/relayapi/api" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/syncapi" - userapi "github.com/matrix-org/dendrite/userapi/api" + appserviceAPI "github.com/element-hq/dendrite/appservice/api" + "github.com/element-hq/dendrite/clientapi" + "github.com/element-hq/dendrite/clientapi/api" + "github.com/element-hq/dendrite/federationapi" + federationAPI "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal/transactions" + "github.com/element-hq/dendrite/mediaapi" + "github.com/element-hq/dendrite/relayapi" + relayAPI "github.com/element-hq/dendrite/relayapi/api" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/syncapi" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" ) diff --git a/setup/mscs/msc2836/msc2836.go b/setup/mscs/msc2836/msc2836.go index 05a129d10..8a9934b9f 100644 --- a/setup/mscs/msc2836/msc2836.go +++ b/setup/mscs/msc2836/msc2836.go @@ -19,15 +19,15 @@ import ( "strings" "time" - fs "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/internal/hooks" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - roomserver "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/synctypes" - userapi "github.com/matrix-org/dendrite/userapi/api" + fs "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/internal/hooks" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + roomserver "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/synctypes" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/setup/mscs/msc2836/msc2836_test.go b/setup/mscs/msc2836/msc2836_test.go index ecbab706f..63bc2c181 100644 --- a/setup/mscs/msc2836/msc2836_test.go +++ b/setup/mscs/msc2836/msc2836_test.go @@ -15,19 +15,19 @@ import ( "time" "github.com/gorilla/mux" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/syncapi/synctypes" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/internal/hooks" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - roomserver "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/mscs/msc2836" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/internal/hooks" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + roomserver "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/mscs/msc2836" + userapi "github.com/element-hq/dendrite/userapi/api" ) var ( diff --git a/setup/mscs/msc2836/storage.go b/setup/mscs/msc2836/storage.go index 696d0b0da..3fef79279 100644 --- a/setup/mscs/msc2836/storage.go +++ b/setup/mscs/msc2836/storage.go @@ -7,9 +7,9 @@ import ( "encoding/base64" "encoding/json" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/setup/mscs/mscs.go b/setup/mscs/mscs.go index 777be49c6..a8f0a44a9 100644 --- a/setup/mscs/mscs.go +++ b/setup/mscs/mscs.go @@ -10,12 +10,12 @@ package mscs import ( "context" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/mscs/msc2836" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/mscs/msc2836" "github.com/matrix-org/util" "github.com/sirupsen/logrus" ) diff --git a/syncapi/consumers/clientapi.go b/syncapi/consumers/clientapi.go index 8eaa9d263..bde8916f2 100644 --- a/syncapi/consumers/clientapi.go +++ b/syncapi/consumers/clientapi.go @@ -19,15 +19,15 @@ import ( log "github.com/sirupsen/logrus" "github.com/tidwall/gjson" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/internal/fulltext" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/syncapi/notifier" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/streams" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/internal/fulltext" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/syncapi/notifier" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/streams" + "github.com/element-hq/dendrite/syncapi/types" ) // OutputClientDataConsumer consumes events that originated in the client API server. diff --git a/syncapi/consumers/keychange.go b/syncapi/consumers/keychange.go index 83ba4f4f8..c7b4c98be 100644 --- a/syncapi/consumers/keychange.go +++ b/syncapi/consumers/keychange.go @@ -11,15 +11,15 @@ import ( "encoding/json" "github.com/getsentry/sentry-go" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/syncapi/notifier" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/streams" - "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/userapi/api" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/syncapi/notifier" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/streams" + "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/userapi/api" "github.com/nats-io/nats.go" "github.com/sirupsen/logrus" ) diff --git a/syncapi/consumers/presence.go b/syncapi/consumers/presence.go index 8615dbabb..ec00e96e7 100644 --- a/syncapi/consumers/presence.go +++ b/syncapi/consumers/presence.go @@ -10,14 +10,14 @@ import ( "context" "strconv" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/syncapi/notifier" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/streams" - "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/syncapi/notifier" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/streams" + "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/nats-io/nats.go" "github.com/sirupsen/logrus" diff --git a/syncapi/consumers/receipts.go b/syncapi/consumers/receipts.go index 709d9bebf..9167922ac 100644 --- a/syncapi/consumers/receipts.go +++ b/syncapi/consumers/receipts.go @@ -14,13 +14,13 @@ import ( "github.com/nats-io/nats.go" log "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/syncapi/notifier" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/streams" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/syncapi/notifier" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/streams" + "github.com/element-hq/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go index 81cdc1ab2..8a54bd6bf 100644 --- a/syncapi/consumers/roomserver.go +++ b/syncapi/consumers/roomserver.go @@ -15,19 +15,19 @@ import ( "fmt" "github.com/getsentry/sentry-go" - "github.com/matrix-org/dendrite/internal/fulltext" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/syncapi/notifier" - "github.com/matrix-org/dendrite/syncapi/producers" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/streams" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal/fulltext" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/syncapi/notifier" + "github.com/element-hq/dendrite/syncapi/producers" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/streams" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/nats-io/nats.go" "github.com/sirupsen/logrus" diff --git a/syncapi/consumers/sendtodevice.go b/syncapi/consumers/sendtodevice.go index 0a56562f7..94d4030fd 100644 --- a/syncapi/consumers/sendtodevice.go +++ b/syncapi/consumers/sendtodevice.go @@ -18,14 +18,14 @@ import ( log "github.com/sirupsen/logrus" "github.com/tidwall/gjson" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/syncapi/notifier" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/streams" - "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/syncapi/notifier" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/streams" + "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/userapi/api" ) // OutputSendToDeviceEventConsumer consumes events that originated in the EDU server. diff --git a/syncapi/consumers/typing.go b/syncapi/consumers/typing.go index 91056f1c4..f518852f1 100644 --- a/syncapi/consumers/typing.go +++ b/syncapi/consumers/typing.go @@ -11,13 +11,13 @@ import ( "strconv" "time" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/syncapi/notifier" - "github.com/matrix-org/dendrite/syncapi/streams" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/syncapi/notifier" + "github.com/element-hq/dendrite/syncapi/streams" + "github.com/element-hq/dendrite/syncapi/types" "github.com/nats-io/nats.go" log "github.com/sirupsen/logrus" ) diff --git a/syncapi/consumers/userapi.go b/syncapi/consumers/userapi.go index a856dc6bf..b21dffb18 100644 --- a/syncapi/consumers/userapi.go +++ b/syncapi/consumers/userapi.go @@ -14,14 +14,14 @@ import ( "github.com/nats-io/nats.go" log "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/syncapi/notifier" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/streams" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/syncapi/notifier" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/streams" + "github.com/element-hq/dendrite/syncapi/types" ) // OutputNotificationDataConsumer consumes events that originated in diff --git a/syncapi/internal/history_visibility.go b/syncapi/internal/history_visibility.go index abf9cf36b..7c5cb861a 100644 --- a/syncapi/internal/history_visibility.go +++ b/syncapi/internal/history_visibility.go @@ -18,9 +18,9 @@ import ( "github.com/sirupsen/logrus" "github.com/tidwall/gjson" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/storage" ) func init() { diff --git a/syncapi/internal/history_visibility_test.go b/syncapi/internal/history_visibility_test.go index 24515bbb2..4046edc09 100644 --- a/syncapi/internal/history_visibility_test.go +++ b/syncapi/internal/history_visibility_test.go @@ -6,9 +6,9 @@ import ( "math" "testing" - rsapi "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/storage" + rsapi "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/storage" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "gotest.tools/v3/assert" diff --git a/syncapi/internal/keychange.go b/syncapi/internal/keychange.go index 4ad6dd6c4..9568d71c7 100644 --- a/syncapi/internal/keychange.go +++ b/syncapi/internal/keychange.go @@ -10,18 +10,18 @@ import ( "context" "strings" - keytypes "github.com/matrix-org/dendrite/userapi/types" + keytypes "github.com/element-hq/dendrite/userapi/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" "github.com/sirupsen/logrus" "github.com/tidwall/gjson" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/userapi/api" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/userapi/api" ) // DeviceOTKCounts adds one-time key counts to the /sync response diff --git a/syncapi/internal/keychange_test.go b/syncapi/internal/keychange_test.go index 56954cfa0..5ffa7f3f9 100644 --- a/syncapi/internal/keychange_test.go +++ b/syncapi/internal/keychange_test.go @@ -10,10 +10,10 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + userapi "github.com/element-hq/dendrite/userapi/api" ) var ( diff --git a/syncapi/notifier/notifier.go b/syncapi/notifier/notifier.go index f57b781e4..80faebaa7 100644 --- a/syncapi/notifier/notifier.go +++ b/syncapi/notifier/notifier.go @@ -11,11 +11,11 @@ import ( "sync" "time" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib/spec" log "github.com/sirupsen/logrus" ) diff --git a/syncapi/notifier/notifier_test.go b/syncapi/notifier/notifier_test.go index c5c47be57..0796093ec 100644 --- a/syncapi/notifier/notifier_test.go +++ b/syncapi/notifier/notifier_test.go @@ -14,10 +14,10 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/types" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" ) diff --git a/syncapi/notifier/userstream.go b/syncapi/notifier/userstream.go index 2daf64238..cbce183dd 100644 --- a/syncapi/notifier/userstream.go +++ b/syncapi/notifier/userstream.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/syncapi/types" ) // UserDeviceStream represents a communication mechanism between the /sync request goroutine diff --git a/syncapi/producers/federationapi_presence.go b/syncapi/producers/federationapi_presence.go index 5b4811754..5b441cb23 100644 --- a/syncapi/producers/federationapi_presence.go +++ b/syncapi/producers/federationapi_presence.go @@ -10,8 +10,8 @@ import ( "strconv" "time" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/nats-io/nats.go" ) diff --git a/syncapi/routing/context.go b/syncapi/routing/context.go index 025982ff2..796429bce 100644 --- a/syncapi/routing/context.go +++ b/syncapi/routing/context.go @@ -15,15 +15,15 @@ import ( "strconv" "time" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - roomserver "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/internal" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + roomserver "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/internal" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/syncapi/routing/context_test.go b/syncapi/routing/context_test.go index 5c6682bd1..79ec5ce3c 100644 --- a/syncapi/routing/context_test.go +++ b/syncapi/routing/context_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/matrix-org/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/synctypes" ) func Test_parseContextParams(t *testing.T) { diff --git a/syncapi/routing/filter.go b/syncapi/routing/filter.go index 24ab9eba1..326c7ff48 100644 --- a/syncapi/routing/filter.go +++ b/syncapi/routing/filter.go @@ -15,10 +15,10 @@ import ( "github.com/matrix-org/util" "github.com/tidwall/gjson" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/sync" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/sync" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/routing/getevent.go b/syncapi/routing/getevent.go index 878853d8d..27befd545 100644 --- a/syncapi/routing/getevent.go +++ b/syncapi/routing/getevent.go @@ -12,12 +12,12 @@ import ( "github.com/matrix-org/util" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/internal" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/internal" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/routing/memberships.go b/syncapi/routing/memberships.go index 6e97bcfea..c0a7eec27 100644 --- a/syncapi/routing/memberships.go +++ b/syncapi/routing/memberships.go @@ -10,11 +10,11 @@ import ( "math" "net/http" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/syncapi/routing/messages.go b/syncapi/routing/messages.go index 8a75d4619..34241cd09 100644 --- a/syncapi/routing/messages.go +++ b/syncapi/routing/messages.go @@ -18,17 +18,17 @@ import ( "github.com/matrix-org/util" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/internal" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/sync" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/internal" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/sync" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + userapi "github.com/element-hq/dendrite/userapi/api" ) type messagesReq struct { diff --git a/syncapi/routing/relations.go b/syncapi/routing/relations.go index 1ceb40cfa..48b05387b 100644 --- a/syncapi/routing/relations.go +++ b/syncapi/routing/relations.go @@ -13,14 +13,14 @@ import ( "github.com/matrix-org/util" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/internal" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/internal" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/routing/routing.go b/syncapi/routing/routing.go index 207a7ecd0..32e5e99c0 100644 --- a/syncapi/routing/routing.go +++ b/syncapi/routing/routing.go @@ -13,14 +13,14 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/fulltext" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/sync" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/fulltext" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/sync" + userapi "github.com/element-hq/dendrite/userapi/api" ) // Setup configures the given mux with sync-server listeners diff --git a/syncapi/routing/search.go b/syncapi/routing/search.go index df5ee4e96..1c6734f9e 100644 --- a/syncapi/routing/search.go +++ b/syncapi/routing/search.go @@ -20,14 +20,14 @@ import ( "github.com/sirupsen/logrus" "github.com/tidwall/gjson" - "github.com/matrix-org/dendrite/clientapi/httputil" - "github.com/matrix-org/dendrite/internal/fulltext" - "github.com/matrix-org/dendrite/internal/sqlutil" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/httputil" + "github.com/element-hq/dendrite/internal/fulltext" + "github.com/element-hq/dendrite/internal/sqlutil" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/userapi/api" ) // nolint:gocyclo diff --git a/syncapi/routing/search_test.go b/syncapi/routing/search_test.go index a983bb7b5..faf88c867 100644 --- a/syncapi/routing/search_test.go +++ b/syncapi/routing/search_test.go @@ -8,16 +8,16 @@ import ( "net/http/httptest" "testing" - "github.com/matrix-org/dendrite/internal/fulltext" - "github.com/matrix-org/dendrite/internal/sqlutil" - rsapi "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/internal/fulltext" + "github.com/element-hq/dendrite/internal/sqlutil" + rsapi "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/stretchr/testify/assert" diff --git a/syncapi/storage/interface.go b/syncapi/storage/interface.go index 88d69d560..8db439e05 100644 --- a/syncapi/storage/interface.go +++ b/syncapi/storage/interface.go @@ -12,14 +12,14 @@ import ( "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/storage/shared" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/storage/shared" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + userapi "github.com/element-hq/dendrite/userapi/api" ) type DatabaseTransaction interface { diff --git a/syncapi/storage/postgres/account_data_table.go b/syncapi/storage/postgres/account_data_table.go index eab1e2d51..8ee464c81 100644 --- a/syncapi/storage/postgres/account_data_table.go +++ b/syncapi/storage/postgres/account_data_table.go @@ -12,11 +12,11 @@ import ( "database/sql" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" ) const accountDataSchema = ` diff --git a/syncapi/storage/postgres/backwards_extremities_table.go b/syncapi/storage/postgres/backwards_extremities_table.go index a205c561f..9a96186a4 100644 --- a/syncapi/storage/postgres/backwards_extremities_table.go +++ b/syncapi/storage/postgres/backwards_extremities_table.go @@ -9,9 +9,9 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/tables" ) const backwardExtremitiesSchema = ` diff --git a/syncapi/storage/postgres/current_room_state_table.go b/syncapi/storage/postgres/current_room_state_table.go index 7af67f3a3..c5d8d5f16 100644 --- a/syncapi/storage/postgres/current_room_state_table.go +++ b/syncapi/storage/postgres/current_room_state_table.go @@ -14,13 +14,13 @@ import ( "errors" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/storage/postgres/deltas" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/storage/postgres/deltas" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/storage/postgres/deltas/2022061412000000_history_visibility_column.go b/syncapi/storage/postgres/deltas/2022061412000000_history_visibility_column.go index 4ac179d0a..7a67ef0fd 100644 --- a/syncapi/storage/postgres/deltas/2022061412000000_history_visibility_column.go +++ b/syncapi/storage/postgres/deltas/2022061412000000_history_visibility_column.go @@ -12,7 +12,7 @@ import ( "encoding/json" "fmt" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/syncapi/storage/postgres/filter_table.go b/syncapi/storage/postgres/filter_table.go index 42dbc544c..61c1a08d3 100644 --- a/syncapi/storage/postgres/filter_table.go +++ b/syncapi/storage/postgres/filter_table.go @@ -11,9 +11,9 @@ import ( "database/sql" "encoding/json" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/synctypes" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/syncapi/storage/postgres/filtering.go b/syncapi/storage/postgres/filtering.go index 4fbc99156..ba0cc004a 100644 --- a/syncapi/storage/postgres/filtering.go +++ b/syncapi/storage/postgres/filtering.go @@ -9,7 +9,7 @@ package postgres import ( "strings" - "github.com/matrix-org/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/synctypes" ) // filterConvertWildcardToSQL converts wildcards as defined in diff --git a/syncapi/storage/postgres/ignores_table.go b/syncapi/storage/postgres/ignores_table.go index b981aaad0..50c82286b 100644 --- a/syncapi/storage/postgres/ignores_table.go +++ b/syncapi/storage/postgres/ignores_table.go @@ -11,9 +11,9 @@ import ( "database/sql" "encoding/json" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" ) const ignoresSchema = ` diff --git a/syncapi/storage/postgres/invites_table.go b/syncapi/storage/postgres/invites_table.go index 3e4ee43b5..2dbb6a8ef 100644 --- a/syncapi/storage/postgres/invites_table.go +++ b/syncapi/storage/postgres/invites_table.go @@ -12,11 +12,11 @@ import ( "database/sql" "encoding/json" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" ) const inviteEventsSchema = ` diff --git a/syncapi/storage/postgres/memberships_table.go b/syncapi/storage/postgres/memberships_table.go index 94c319ea4..e4bcaad3d 100644 --- a/syncapi/storage/postgres/memberships_table.go +++ b/syncapi/storage/postgres/memberships_table.go @@ -11,11 +11,11 @@ import ( "database/sql" "fmt" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" ) // The memberships table is designed to track the last time that diff --git a/syncapi/storage/postgres/notification_data_table.go b/syncapi/storage/postgres/notification_data_table.go index b98cb4269..24b3daa7b 100644 --- a/syncapi/storage/postgres/notification_data_table.go +++ b/syncapi/storage/postgres/notification_data_table.go @@ -12,11 +12,11 @@ import ( "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" ) func NewPostgresNotificationDataTable(db *sql.DB) (tables.NotificationData, error) { diff --git a/syncapi/storage/postgres/output_room_events_table.go b/syncapi/storage/postgres/output_room_events_table.go index 4c07c028f..357c3cb01 100644 --- a/syncapi/storage/postgres/output_room_events_table.go +++ b/syncapi/storage/postgres/output_room_events_table.go @@ -15,14 +15,14 @@ import ( "sort" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/storage/postgres/deltas" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/storage/postgres/deltas" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/syncapi/storage/postgres/output_room_events_topology_table.go b/syncapi/storage/postgres/output_room_events_topology_table.go index 64c085ba5..f8a6d0dd7 100644 --- a/syncapi/storage/postgres/output_room_events_topology_table.go +++ b/syncapi/storage/postgres/output_room_events_topology_table.go @@ -9,11 +9,11 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" ) const outputRoomEventsTopologySchema = ` diff --git a/syncapi/storage/postgres/peeks_table.go b/syncapi/storage/postgres/peeks_table.go index 462f48eae..242bae574 100644 --- a/syncapi/storage/postgres/peeks_table.go +++ b/syncapi/storage/postgres/peeks_table.go @@ -11,10 +11,10 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" ) const peeksSchema = ` diff --git a/syncapi/storage/postgres/presence_table.go b/syncapi/storage/postgres/presence_table.go index 1daed8f9d..48b667506 100644 --- a/syncapi/storage/postgres/presence_table.go +++ b/syncapi/storage/postgres/presence_table.go @@ -14,10 +14,10 @@ import ( "github.com/lib/pq" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" ) const presenceSchema = ` diff --git a/syncapi/storage/postgres/receipt_table.go b/syncapi/storage/postgres/receipt_table.go index a1ae0d3d4..94f6ef644 100644 --- a/syncapi/storage/postgres/receipt_table.go +++ b/syncapi/storage/postgres/receipt_table.go @@ -13,11 +13,11 @@ import ( "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/postgres/deltas" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/postgres/deltas" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/storage/postgres/relations_table.go b/syncapi/storage/postgres/relations_table.go index 406b5f647..ae7327568 100644 --- a/syncapi/storage/postgres/relations_table.go +++ b/syncapi/storage/postgres/relations_table.go @@ -10,10 +10,10 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" ) const relationsSchema = ` diff --git a/syncapi/storage/postgres/send_to_device_table.go b/syncapi/storage/postgres/send_to_device_table.go index 4cd5039e8..5d48ca624 100644 --- a/syncapi/storage/postgres/send_to_device_table.go +++ b/syncapi/storage/postgres/send_to_device_table.go @@ -11,11 +11,11 @@ import ( "database/sql" "encoding/json" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/postgres/deltas" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/postgres/deltas" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" "github.com/sirupsen/logrus" ) diff --git a/syncapi/storage/postgres/syncserver.go b/syncapi/storage/postgres/syncserver.go index 5596986c1..e6ce7254b 100644 --- a/syncapi/storage/postgres/syncserver.go +++ b/syncapi/storage/postgres/syncserver.go @@ -13,10 +13,10 @@ import ( // Import the postgres database driver. _ "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/storage/postgres/deltas" - "github.com/matrix-org/dendrite/syncapi/storage/shared" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/storage/postgres/deltas" + "github.com/element-hq/dendrite/syncapi/storage/shared" ) // SyncServerDatasource represents a sync server datasource which manages diff --git a/syncapi/storage/shared/storage_consumer.go b/syncapi/storage/shared/storage_consumer.go index 86998b66a..8fb0eca69 100644 --- a/syncapi/storage/shared/storage_consumer.go +++ b/syncapi/storage/shared/storage_consumer.go @@ -14,19 +14,19 @@ import ( "github.com/tidwall/gjson" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/gomatrixserverlib" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" ) // Database is a temporary struct until we have made syncserver.go the same for both pq/sqlite diff --git a/syncapi/storage/shared/storage_consumer_test.go b/syncapi/storage/shared/storage_consumer_test.go index e5f734c96..486515f96 100644 --- a/syncapi/storage/shared/storage_consumer_test.go +++ b/syncapi/storage/shared/storage_consumer_test.go @@ -5,12 +5,12 @@ import ( "reflect" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" ) func newSyncDB(t *testing.T, dbType test.DBType) (storage.Database, func()) { diff --git a/syncapi/storage/shared/storage_sync.go b/syncapi/storage/shared/storage_sync.go index cd17fdc69..23f84200c 100644 --- a/syncapi/storage/shared/storage_sync.go +++ b/syncapi/storage/shared/storage_sync.go @@ -9,12 +9,12 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "github.com/tidwall/gjson" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + userapi "github.com/element-hq/dendrite/userapi/api" ) type DatabaseTransaction struct { diff --git a/syncapi/storage/shared/storage_sync_test.go b/syncapi/storage/shared/storage_sync_test.go index 4468a7728..0b402519c 100644 --- a/syncapi/storage/shared/storage_sync_test.go +++ b/syncapi/storage/shared/storage_sync_test.go @@ -3,7 +3,7 @@ package shared import ( "testing" - "github.com/matrix-org/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/synctypes" ) func Test_isStatefilterEmpty(t *testing.T) { diff --git a/syncapi/storage/sqlite3/account_data_table.go b/syncapi/storage/sqlite3/account_data_table.go index a5231f00c..dad410109 100644 --- a/syncapi/storage/sqlite3/account_data_table.go +++ b/syncapi/storage/sqlite3/account_data_table.go @@ -11,11 +11,11 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" ) const accountDataSchema = ` diff --git a/syncapi/storage/sqlite3/backwards_extremities_table.go b/syncapi/storage/sqlite3/backwards_extremities_table.go index d97e6c478..c3f335a60 100644 --- a/syncapi/storage/sqlite3/backwards_extremities_table.go +++ b/syncapi/storage/sqlite3/backwards_extremities_table.go @@ -9,9 +9,9 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/tables" ) const backwardExtremitiesSchema = ` diff --git a/syncapi/storage/sqlite3/current_room_state_table.go b/syncapi/storage/sqlite3/current_room_state_table.go index b0872ee66..fd12adb6b 100644 --- a/syncapi/storage/sqlite3/current_room_state_table.go +++ b/syncapi/storage/sqlite3/current_room_state_table.go @@ -15,13 +15,13 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/storage/sqlite3/deltas" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/storage/sqlite3/deltas/2022061412000000_history_visibility_column.go b/syncapi/storage/sqlite3/deltas/2022061412000000_history_visibility_column.go index 4f1f7123e..3ffb5bfa1 100644 --- a/syncapi/storage/sqlite3/deltas/2022061412000000_history_visibility_column.go +++ b/syncapi/storage/sqlite3/deltas/2022061412000000_history_visibility_column.go @@ -12,7 +12,7 @@ import ( "encoding/json" "fmt" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/syncapi/storage/sqlite3/filter_table.go b/syncapi/storage/sqlite3/filter_table.go index 56aef4bbc..dfb4d029f 100644 --- a/syncapi/storage/sqlite3/filter_table.go +++ b/syncapi/storage/sqlite3/filter_table.go @@ -12,9 +12,9 @@ import ( "encoding/json" "fmt" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/synctypes" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/syncapi/storage/sqlite3/filtering.go b/syncapi/storage/sqlite3/filtering.go index 17a37a2df..50cdd537d 100644 --- a/syncapi/storage/sqlite3/filtering.go +++ b/syncapi/storage/sqlite3/filtering.go @@ -4,7 +4,7 @@ import ( "database/sql" "fmt" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal/sqlutil" ) type FilterOrder int diff --git a/syncapi/storage/sqlite3/ignores_table.go b/syncapi/storage/sqlite3/ignores_table.go index 08376f255..d08296bc0 100644 --- a/syncapi/storage/sqlite3/ignores_table.go +++ b/syncapi/storage/sqlite3/ignores_table.go @@ -11,9 +11,9 @@ import ( "database/sql" "encoding/json" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" ) const ignoresSchema = ` diff --git a/syncapi/storage/sqlite3/invites_table.go b/syncapi/storage/sqlite3/invites_table.go index 57ae38840..03a83aa4f 100644 --- a/syncapi/storage/sqlite3/invites_table.go +++ b/syncapi/storage/sqlite3/invites_table.go @@ -12,11 +12,11 @@ import ( "database/sql" "encoding/json" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" ) const inviteEventsSchema = ` diff --git a/syncapi/storage/sqlite3/memberships_table.go b/syncapi/storage/sqlite3/memberships_table.go index 50b55801b..323bfa874 100644 --- a/syncapi/storage/sqlite3/memberships_table.go +++ b/syncapi/storage/sqlite3/memberships_table.go @@ -11,11 +11,11 @@ import ( "database/sql" "fmt" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" ) // The memberships table is designed to track the last time that diff --git a/syncapi/storage/sqlite3/notification_data_table.go b/syncapi/storage/sqlite3/notification_data_table.go index 02068f8dd..748046312 100644 --- a/syncapi/storage/sqlite3/notification_data_table.go +++ b/syncapi/storage/sqlite3/notification_data_table.go @@ -11,11 +11,11 @@ import ( "database/sql" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" ) func NewSqliteNotificationDataTable(db *sql.DB, streamID *StreamIDStatements) (tables.NotificationData, error) { diff --git a/syncapi/storage/sqlite3/output_room_events_table.go b/syncapi/storage/sqlite3/output_room_events_table.go index 4872951f2..36892cff1 100644 --- a/syncapi/storage/sqlite3/output_room_events_table.go +++ b/syncapi/storage/sqlite3/output_room_events_table.go @@ -15,16 +15,16 @@ import ( "sort" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/storage/sqlite3/deltas" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal/sqlutil" ) const outputRoomEventsSchema = ` diff --git a/syncapi/storage/sqlite3/output_room_events_topology_table.go b/syncapi/storage/sqlite3/output_room_events_topology_table.go index 439961f16..7e91d76d4 100644 --- a/syncapi/storage/sqlite3/output_room_events_topology_table.go +++ b/syncapi/storage/sqlite3/output_room_events_topology_table.go @@ -9,11 +9,11 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" ) const outputRoomEventsTopologySchema = ` diff --git a/syncapi/storage/sqlite3/peeks_table.go b/syncapi/storage/sqlite3/peeks_table.go index 61557f404..95884eb18 100644 --- a/syncapi/storage/sqlite3/peeks_table.go +++ b/syncapi/storage/sqlite3/peeks_table.go @@ -11,10 +11,10 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" ) const peeksSchema = ` diff --git a/syncapi/storage/sqlite3/presence_table.go b/syncapi/storage/sqlite3/presence_table.go index e1f6be449..29a2685e0 100644 --- a/syncapi/storage/sqlite3/presence_table.go +++ b/syncapi/storage/sqlite3/presence_table.go @@ -14,10 +14,10 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" ) const presenceSchema = ` diff --git a/syncapi/storage/sqlite3/receipt_table.go b/syncapi/storage/sqlite3/receipt_table.go index 61e203e4c..86f88d29e 100644 --- a/syncapi/storage/sqlite3/receipt_table.go +++ b/syncapi/storage/sqlite3/receipt_table.go @@ -12,11 +12,11 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/sqlite3/deltas" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/storage/sqlite3/relations_table.go b/syncapi/storage/sqlite3/relations_table.go index 8ba69223c..e43038818 100644 --- a/syncapi/storage/sqlite3/relations_table.go +++ b/syncapi/storage/sqlite3/relations_table.go @@ -10,10 +10,10 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" ) const relationsSchema = ` diff --git a/syncapi/storage/sqlite3/send_to_device_table.go b/syncapi/storage/sqlite3/send_to_device_table.go index 5f3d96ab2..3eddf84d5 100644 --- a/syncapi/storage/sqlite3/send_to_device_table.go +++ b/syncapi/storage/sqlite3/send_to_device_table.go @@ -11,11 +11,11 @@ import ( "database/sql" "encoding/json" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/storage/sqlite3/deltas" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" "github.com/sirupsen/logrus" ) diff --git a/syncapi/storage/sqlite3/stream_id_table.go b/syncapi/storage/sqlite3/stream_id_table.go index b51eccf55..f0a5aec3a 100644 --- a/syncapi/storage/sqlite3/stream_id_table.go +++ b/syncapi/storage/sqlite3/stream_id_table.go @@ -4,8 +4,8 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/types" ) const streamIDTableSchema = ` diff --git a/syncapi/storage/sqlite3/syncserver.go b/syncapi/storage/sqlite3/syncserver.go index c52c72228..9d12899a6 100644 --- a/syncapi/storage/sqlite3/syncserver.go +++ b/syncapi/storage/sqlite3/syncserver.go @@ -11,10 +11,10 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/storage/shared" - "github.com/matrix-org/dendrite/syncapi/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/storage/shared" + "github.com/element-hq/dendrite/syncapi/storage/sqlite3/deltas" ) // SyncServerDatasource represents a sync server datasource which manages diff --git a/syncapi/storage/storage.go b/syncapi/storage/storage.go index 719659a3d..806a007fb 100644 --- a/syncapi/storage/storage.go +++ b/syncapi/storage/storage.go @@ -13,10 +13,10 @@ import ( "context" "fmt" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/storage/postgres" - "github.com/matrix-org/dendrite/syncapi/storage/sqlite3" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/storage/postgres" + "github.com/element-hq/dendrite/syncapi/storage/sqlite3" ) // NewSyncServerDatasource opens a database connection. diff --git a/syncapi/storage/storage_test.go b/syncapi/storage/storage_test.go index ce7ca3fc7..4b60b2735 100644 --- a/syncapi/storage/storage_test.go +++ b/syncapi/storage/storage_test.go @@ -9,14 +9,14 @@ import ( "reflect" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/stretchr/testify/assert" diff --git a/syncapi/storage/storage_wasm.go b/syncapi/storage/storage_wasm.go index cc1246cc3..a1629556e 100644 --- a/syncapi/storage/storage_wasm.go +++ b/syncapi/storage/storage_wasm.go @@ -10,9 +10,9 @@ import ( "context" "fmt" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/storage/sqlite3" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/storage/sqlite3" ) // NewPublicRoomsServerDatabase opens a database connection. diff --git a/syncapi/storage/tables/current_room_state_test.go b/syncapi/storage/tables/current_room_state_test.go index 2df111a26..8f0952221 100644 --- a/syncapi/storage/tables/current_room_state_test.go +++ b/syncapi/storage/tables/current_room_state_test.go @@ -6,14 +6,14 @@ import ( "fmt" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/storage/postgres" - "github.com/matrix-org/dendrite/syncapi/storage/sqlite3" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/storage/postgres" + "github.com/element-hq/dendrite/syncapi/storage/sqlite3" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/storage/tables/interface.go b/syncapi/storage/tables/interface.go index 65db49115..235ed95f2 100644 --- a/syncapi/storage/tables/interface.go +++ b/syncapi/storage/tables/interface.go @@ -13,11 +13,11 @@ import ( "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" ) type AccountData interface { diff --git a/syncapi/storage/tables/memberships_test.go b/syncapi/storage/tables/memberships_test.go index 0a36f5887..93489a045 100644 --- a/syncapi/storage/tables/memberships_test.go +++ b/syncapi/storage/tables/memberships_test.go @@ -8,14 +8,14 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/internal/sqlutil" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/storage/postgres" - "github.com/matrix-org/dendrite/syncapi/storage/sqlite3" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/storage/postgres" + "github.com/element-hq/dendrite/syncapi/storage/sqlite3" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/test" ) func newMembershipsTable(t *testing.T, dbType test.DBType) (tables.Memberships, *sql.DB, func()) { diff --git a/syncapi/storage/tables/output_room_events_test.go b/syncapi/storage/tables/output_room_events_test.go index 9b755dc85..86758ea64 100644 --- a/syncapi/storage/tables/output_room_events_test.go +++ b/syncapi/storage/tables/output_room_events_test.go @@ -7,13 +7,13 @@ import ( "reflect" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/storage/postgres" - "github.com/matrix-org/dendrite/syncapi/storage/sqlite3" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/storage/postgres" + "github.com/element-hq/dendrite/syncapi/storage/sqlite3" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/storage/tables/presence_table_test.go b/syncapi/storage/tables/presence_table_test.go index d8161836b..9105b889d 100644 --- a/syncapi/storage/tables/presence_table_test.go +++ b/syncapi/storage/tables/presence_table_test.go @@ -7,14 +7,14 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/storage/postgres" - "github.com/matrix-org/dendrite/syncapi/storage/sqlite3" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/storage/postgres" + "github.com/element-hq/dendrite/syncapi/storage/sqlite3" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/test" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/storage/tables/relations_test.go b/syncapi/storage/tables/relations_test.go index 46270e36d..b82cef140 100644 --- a/syncapi/storage/tables/relations_test.go +++ b/syncapi/storage/tables/relations_test.go @@ -5,13 +5,13 @@ import ( "database/sql" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/storage/postgres" - "github.com/matrix-org/dendrite/syncapi/storage/sqlite3" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/storage/postgres" + "github.com/element-hq/dendrite/syncapi/storage/sqlite3" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/test" ) func newRelationsTable(t *testing.T, dbType test.DBType) (tables.Relations, *sql.DB, func()) { diff --git a/syncapi/storage/tables/topology_test.go b/syncapi/storage/tables/topology_test.go index 7691cc5f8..200d32144 100644 --- a/syncapi/storage/tables/topology_test.go +++ b/syncapi/storage/tables/topology_test.go @@ -6,13 +6,13 @@ import ( "fmt" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/storage/postgres" - "github.com/matrix-org/dendrite/syncapi/storage/sqlite3" - "github.com/matrix-org/dendrite/syncapi/storage/tables" - "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/storage/postgres" + "github.com/element-hq/dendrite/syncapi/storage/sqlite3" + "github.com/element-hq/dendrite/syncapi/storage/tables" + "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/test" "github.com/stretchr/testify/assert" ) diff --git a/syncapi/streams/stream_accountdata.go b/syncapi/streams/stream_accountdata.go index 51f2a3d30..e07218348 100644 --- a/syncapi/streams/stream_accountdata.go +++ b/syncapi/streams/stream_accountdata.go @@ -3,10 +3,10 @@ package streams import ( "context" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/streams/stream_devicelist.go b/syncapi/streams/stream_devicelist.go index e8189c352..fc61b6599 100644 --- a/syncapi/streams/stream_devicelist.go +++ b/syncapi/streams/stream_devicelist.go @@ -3,11 +3,11 @@ package streams import ( "context" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/syncapi/internal" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/syncapi/internal" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/types" + userapi "github.com/element-hq/dendrite/userapi/api" ) type DeviceListStreamProvider struct { diff --git a/syncapi/streams/stream_invite.go b/syncapi/streams/stream_invite.go index a3634c03f..0f2f612f3 100644 --- a/syncapi/streams/stream_invite.go +++ b/syncapi/streams/stream_invite.go @@ -10,10 +10,10 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" ) type InviteStreamProvider struct { diff --git a/syncapi/streams/stream_notificationdata.go b/syncapi/streams/stream_notificationdata.go index 66ee0ded9..2c1eb4ed5 100644 --- a/syncapi/streams/stream_notificationdata.go +++ b/syncapi/streams/stream_notificationdata.go @@ -3,9 +3,9 @@ package streams import ( "context" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/types" ) type NotificationDataStreamProvider struct { diff --git a/syncapi/streams/stream_pdu.go b/syncapi/streams/stream_pdu.go index 790f5bd1b..e55ff168f 100644 --- a/syncapi/streams/stream_pdu.go +++ b/syncapi/streams/stream_pdu.go @@ -6,17 +6,17 @@ import ( "fmt" "time" - "github.com/matrix-org/dendrite/internal/caching" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/internal" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/internal/caching" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/internal" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/syncapi/notifier" + "github.com/element-hq/dendrite/syncapi/notifier" "github.com/matrix-org/gomatrixserverlib" "github.com/sirupsen/logrus" ) diff --git a/syncapi/streams/stream_presence.go b/syncapi/streams/stream_presence.go index be228b8e1..434c57bd8 100644 --- a/syncapi/streams/stream_presence.go +++ b/syncapi/streams/stream_presence.go @@ -14,10 +14,10 @@ import ( "github.com/tidwall/gjson" - "github.com/matrix-org/dendrite/syncapi/notifier" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/syncapi/notifier" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/streams/stream_receipt.go b/syncapi/streams/stream_receipt.go index ed52dc5c7..8a4f06b8a 100644 --- a/syncapi/streams/stream_receipt.go +++ b/syncapi/streams/stream_receipt.go @@ -6,9 +6,9 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" ) type ReceiptStreamProvider struct { diff --git a/syncapi/streams/stream_sendtodevice.go b/syncapi/streams/stream_sendtodevice.go index 00b67cc42..6d20527cc 100644 --- a/syncapi/streams/stream_sendtodevice.go +++ b/syncapi/streams/stream_sendtodevice.go @@ -3,8 +3,8 @@ package streams import ( "context" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/types" ) type SendToDeviceStreamProvider struct { diff --git a/syncapi/streams/stream_typing.go b/syncapi/streams/stream_typing.go index 15500a470..d0372021d 100644 --- a/syncapi/streams/stream_typing.go +++ b/syncapi/streams/stream_typing.go @@ -4,10 +4,10 @@ import ( "context" "encoding/json" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/streams/streamprovider.go b/syncapi/streams/streamprovider.go index 8b12e2eba..fde6f4364 100644 --- a/syncapi/streams/streamprovider.go +++ b/syncapi/streams/streamprovider.go @@ -3,8 +3,8 @@ package streams import ( "context" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/types" ) type StreamProvider interface { diff --git a/syncapi/streams/streams.go b/syncapi/streams/streams.go index f25bc978f..b918b50fc 100644 --- a/syncapi/streams/streams.go +++ b/syncapi/streams/streams.go @@ -3,13 +3,13 @@ package streams import ( "context" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - rsapi "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/syncapi/notifier" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + rsapi "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/syncapi/notifier" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/types" + userapi "github.com/element-hq/dendrite/userapi/api" ) type Streams struct { diff --git a/syncapi/streams/template_stream.go b/syncapi/streams/template_stream.go index f208d84e4..3529c3f24 100644 --- a/syncapi/streams/template_stream.go +++ b/syncapi/streams/template_stream.go @@ -4,8 +4,8 @@ import ( "context" "sync" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/types" ) type DefaultStreamProvider struct { diff --git a/syncapi/sync/request.go b/syncapi/sync/request.go index 76ac216ba..50fe2da8f 100644 --- a/syncapi/sync/request.go +++ b/syncapi/sync/request.go @@ -19,10 +19,10 @@ import ( "github.com/matrix-org/util" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + userapi "github.com/element-hq/dendrite/userapi/api" ) const defaultSyncTimeout = time.Duration(0) diff --git a/syncapi/sync/requestpool.go b/syncapi/sync/requestpool.go index 3c09966c9..0e0665119 100644 --- a/syncapi/sync/requestpool.go +++ b/syncapi/sync/requestpool.go @@ -22,15 +22,15 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal/sqlutil" - roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/internal" - "github.com/matrix-org/dendrite/syncapi/notifier" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/streams" - "github.com/matrix-org/dendrite/syncapi/types" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/internal/sqlutil" + roomserverAPI "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/internal" + "github.com/element-hq/dendrite/syncapi/notifier" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/streams" + "github.com/element-hq/dendrite/syncapi/types" + userapi "github.com/element-hq/dendrite/userapi/api" ) // RequestPool manages HTTP long-poll connections for /sync diff --git a/syncapi/sync/requestpool_test.go b/syncapi/sync/requestpool_test.go index e083507e8..e953bb930 100644 --- a/syncapi/sync/requestpool_test.go +++ b/syncapi/sync/requestpool_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/syncapi.go b/syncapi/syncapi.go index 465f60bf2..aa4d2cad7 100644 --- a/syncapi/syncapi.go +++ b/syncapi/syncapi.go @@ -9,26 +9,26 @@ package syncapi import ( "context" - "github.com/matrix-org/dendrite/internal/fulltext" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/internal/fulltext" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/process" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/caching" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/jetstream" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/jetstream" + userapi "github.com/element-hq/dendrite/userapi/api" - "github.com/matrix-org/dendrite/syncapi/consumers" - "github.com/matrix-org/dendrite/syncapi/notifier" - "github.com/matrix-org/dendrite/syncapi/producers" - "github.com/matrix-org/dendrite/syncapi/routing" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/streams" - "github.com/matrix-org/dendrite/syncapi/sync" + "github.com/element-hq/dendrite/syncapi/consumers" + "github.com/element-hq/dendrite/syncapi/notifier" + "github.com/element-hq/dendrite/syncapi/producers" + "github.com/element-hq/dendrite/syncapi/routing" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/streams" + "github.com/element-hq/dendrite/syncapi/sync" ) // AddPublicRoutes sets up and registers HTTP handlers for the SyncAPI diff --git a/syncapi/syncapi_test.go b/syncapi/syncapi_test.go index d360e10d9..9a9c9b9cd 100644 --- a/syncapi/syncapi_test.go +++ b/syncapi/syncapi_test.go @@ -12,30 +12,30 @@ import ( "time" "github.com/gorilla/mux" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/tidwall/gjson" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/routing" - "github.com/matrix-org/dendrite/syncapi/storage" - "github.com/matrix-org/dendrite/syncapi/synctypes" - - "github.com/matrix-org/dendrite/clientapi/producers" - "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/roomserver/api" - rsapi "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" - userapi "github.com/matrix-org/dendrite/userapi/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/routing" + "github.com/element-hq/dendrite/syncapi/storage" + "github.com/element-hq/dendrite/syncapi/synctypes" + + "github.com/element-hq/dendrite/clientapi/producers" + "github.com/element-hq/dendrite/roomserver" + "github.com/element-hq/dendrite/roomserver/api" + rsapi "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" + userapi "github.com/element-hq/dendrite/userapi/api" ) type syncRoomserverAPI struct { diff --git a/syncapi/types/provider.go b/syncapi/types/provider.go index a0fcec0f6..95e7040af 100644 --- a/syncapi/types/provider.go +++ b/syncapi/types/provider.go @@ -6,8 +6,8 @@ import ( "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/syncapi/synctypes" - userapi "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/syncapi/synctypes" + userapi "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/types/types.go b/syncapi/types/types.go index 6c6e99a40..f30cb8a74 100644 --- a/syncapi/types/types.go +++ b/syncapi/types/types.go @@ -18,9 +18,9 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "github.com/tidwall/gjson" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/synctypes" ) var ( diff --git a/syncapi/types/types_test.go b/syncapi/types/types_test.go index 6c616ab0d..15271fb4a 100644 --- a/syncapi/types/types_test.go +++ b/syncapi/types/types_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/syncapi/synctypes" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/test/event.go b/test/event.go index 04c2d1a57..474c573bf 100644 --- a/test/event.go +++ b/test/event.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/test/memory_federation_db.go b/test/memory_federation_db.go index a4042f7b3..d7cab1391 100644 --- a/test/memory_federation_db.go +++ b/test/memory_federation_db.go @@ -13,9 +13,9 @@ import ( "sync" "time" - "github.com/matrix-org/dendrite/federationapi/storage/shared/receipt" - "github.com/matrix-org/dendrite/federationapi/types" - rstypes "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/federationapi/storage/shared/receipt" + "github.com/element-hq/dendrite/federationapi/types" + rstypes "github.com/element-hq/dendrite/roomserver/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/test/room.go b/test/room.go index 988adc88f..8881b047d 100644 --- a/test/room.go +++ b/test/room.go @@ -16,8 +16,8 @@ import ( "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/internal/eventutil" - rstypes "github.com/matrix-org/dendrite/roomserver/types" + "github.com/element-hq/dendrite/internal/eventutil" + rstypes "github.com/element-hq/dendrite/roomserver/types" ) type Preset int diff --git a/test/testrig/base.go b/test/testrig/base.go index 28bbd0840..9d67c50af 100644 --- a/test/testrig/base.go +++ b/test/testrig/base.go @@ -11,9 +11,9 @@ import ( "path/filepath" "testing" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/test" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/test" ) func CreateConfig(t *testing.T, dbType test.DBType) (*config.Dendrite, *process.ProcessContext, func()) { diff --git a/test/testrig/jetstream.go b/test/testrig/jetstream.go index 5f15cfb3e..ad0459748 100644 --- a/test/testrig/jetstream.go +++ b/test/testrig/jetstream.go @@ -4,11 +4,11 @@ import ( "encoding/json" "testing" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/config" "github.com/nats-io/nats.go" - "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/jetstream" ) func MustPublishMsgs(t *testing.T, jsctx nats.JetStreamContext, msgs ...*nats.Msg) { diff --git a/test/user.go b/test/user.go index 273d90437..aeed8b52a 100644 --- a/test/user.go +++ b/test/user.go @@ -13,7 +13,7 @@ import ( "sync/atomic" "testing" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/userapi/api/api.go b/userapi/api/api.go index 42f0c8c9d..5aa49681b 100644 --- a/userapi/api/api.go +++ b/userapi/api/api.go @@ -13,15 +13,15 @@ import ( "strings" "time" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/userapi/types" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/userapi/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" - clientapi "github.com/matrix-org/dendrite/clientapi/api" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/internal/pushrules" + clientapi "github.com/element-hq/dendrite/clientapi/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/internal/pushrules" ) // UserInternalAPI is the internal API for information about users and devices. diff --git a/userapi/consumers/clientapi.go b/userapi/consumers/clientapi.go index ebb567bcc..9172a8d24 100644 --- a/userapi/consumers/clientapi.go +++ b/userapi/consumers/clientapi.go @@ -14,14 +14,14 @@ import ( "github.com/nats-io/nats.go" log "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal/pushgateway" - "github.com/matrix-org/dendrite/userapi/storage" - - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/userapi/producers" - "github.com/matrix-org/dendrite/userapi/util" + "github.com/element-hq/dendrite/internal/pushgateway" + "github.com/element-hq/dendrite/userapi/storage" + + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/userapi/producers" + "github.com/element-hq/dendrite/userapi/util" ) // OutputReceiptEventConsumer consumes events that originated in the clientAPI. diff --git a/userapi/consumers/devicelistupdate.go b/userapi/consumers/devicelistupdate.go index dd22a937d..c7e14098f 100644 --- a/userapi/consumers/devicelistupdate.go +++ b/userapi/consumers/devicelistupdate.go @@ -11,15 +11,15 @@ import ( "encoding/json" "time" - "github.com/matrix-org/dendrite/userapi/internal" + "github.com/element-hq/dendrite/userapi/internal" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/nats-io/nats.go" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" ) // DeviceListUpdateConsumer consumes device list updates that came in over federation. diff --git a/userapi/consumers/roomserver.go b/userapi/consumers/roomserver.go index fca741298..a79441f33 100644 --- a/userapi/consumers/roomserver.go +++ b/userapi/consumers/roomserver.go @@ -17,22 +17,22 @@ import ( "github.com/nats-io/nats.go" log "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/internal/pushgateway" - "github.com/matrix-org/dendrite/internal/pushrules" - rsapi "github.com/matrix-org/dendrite/roomserver/api" - rstypes "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/producers" - "github.com/matrix-org/dendrite/userapi/storage" - "github.com/matrix-org/dendrite/userapi/storage/tables" - userAPITypes "github.com/matrix-org/dendrite/userapi/types" - "github.com/matrix-org/dendrite/userapi/util" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/internal/pushgateway" + "github.com/element-hq/dendrite/internal/pushrules" + rsapi "github.com/element-hq/dendrite/roomserver/api" + rstypes "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/producers" + "github.com/element-hq/dendrite/userapi/storage" + "github.com/element-hq/dendrite/userapi/storage/tables" + userAPITypes "github.com/element-hq/dendrite/userapi/types" + "github.com/element-hq/dendrite/userapi/util" ) type OutputRoomEventConsumer struct { diff --git a/userapi/consumers/roomserver_test.go b/userapi/consumers/roomserver_test.go index 7b7c08618..79b1b8e78 100644 --- a/userapi/consumers/roomserver_test.go +++ b/userapi/consumers/roomserver_test.go @@ -8,23 +8,23 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/roomserver/types" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/test/testrig" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver" + "github.com/element-hq/dendrite/roomserver/types" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/test/testrig" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/stretchr/testify/assert" "golang.org/x/crypto/bcrypt" - "github.com/matrix-org/dendrite/internal/pushrules" - rsapi "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/userapi/storage" - userAPITypes "github.com/matrix-org/dendrite/userapi/types" + "github.com/element-hq/dendrite/internal/pushrules" + rsapi "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/userapi/storage" + userAPITypes "github.com/element-hq/dendrite/userapi/types" ) func mustCreateDatabase(t *testing.T, dbType test.DBType) (storage.UserDatabase, func()) { diff --git a/userapi/consumers/signingkeyupdate.go b/userapi/consumers/signingkeyupdate.go index 781089ce1..3bc52364b 100644 --- a/userapi/consumers/signingkeyupdate.go +++ b/userapi/consumers/signingkeyupdate.go @@ -16,10 +16,10 @@ import ( "github.com/nats-io/nats.go" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/userapi/api" ) // SigningKeyUpdateConsumer consumes signing key updates that came in over federation. diff --git a/userapi/internal/api_logintoken.go b/userapi/internal/api_logintoken.go index c141b7bf4..824973c37 100644 --- a/userapi/internal/api_logintoken.go +++ b/userapi/internal/api_logintoken.go @@ -11,7 +11,7 @@ import ( "database/sql" "fmt" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" ) diff --git a/userapi/internal/cross_signing.go b/userapi/internal/cross_signing.go index 6e0a7110b..be7ccd2f2 100644 --- a/userapi/internal/cross_signing.go +++ b/userapi/internal/cross_signing.go @@ -14,8 +14,8 @@ import ( "fmt" "strings" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/types" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/userapi/internal/device_list_update.go b/userapi/internal/device_list_update.go index 9b4cf6a74..67dd62759 100644 --- a/userapi/internal/device_list_update.go +++ b/userapi/internal/device_list_update.go @@ -17,8 +17,8 @@ import ( "sync" "time" - "github.com/matrix-org/dendrite/federationapi/statistics" - rsapi "github.com/matrix-org/dendrite/roomserver/api" + "github.com/element-hq/dendrite/federationapi/statistics" + rsapi "github.com/element-hq/dendrite/roomserver/api" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" @@ -28,9 +28,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - fedsenderapi "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/userapi/api" + fedsenderapi "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/userapi/api" ) var ( diff --git a/userapi/internal/device_list_update_test.go b/userapi/internal/device_list_update_test.go index 8affd47c5..815f803c9 100644 --- a/userapi/internal/device_list_update_test.go +++ b/userapi/internal/device_list_update_test.go @@ -19,20 +19,20 @@ import ( "testing" "time" - api2 "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/federationapi/statistics" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/sqlutil" + api2 "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/federationapi/statistics" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" - roomserver "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage" + roomserver "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage" ) var ( diff --git a/userapi/internal/key_api.go b/userapi/internal/key_api.go index 10e06b5f2..ff15f7e52 100644 --- a/userapi/internal/key_api.go +++ b/userapi/internal/key_api.go @@ -23,7 +23,7 @@ import ( "github.com/tidwall/gjson" "github.com/tidwall/sjson" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/api" ) func (a *UserInternalAPI) QueryKeyChanges(ctx context.Context, req *api.QueryKeyChangesRequest, res *api.QueryKeyChangesResponse) error { diff --git a/userapi/internal/key_api_test.go b/userapi/internal/key_api_test.go index de2a6d2c8..03d8e742e 100644 --- a/userapi/internal/key_api_test.go +++ b/userapi/internal/key_api_test.go @@ -5,12 +5,12 @@ import ( "reflect" "testing" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/internal" - "github.com/matrix-org/dendrite/userapi/storage" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/internal" + "github.com/element-hq/dendrite/userapi/storage" ) func mustCreateDatabase(t *testing.T, dbType test.DBType) (storage.KeyDatabase, func()) { diff --git a/userapi/internal/user_api.go b/userapi/internal/user_api.go index 73ca3783e..4344a17ed 100644 --- a/userapi/internal/user_api.go +++ b/userapi/internal/user_api.go @@ -15,29 +15,29 @@ import ( "strconv" "time" - appserviceAPI "github.com/matrix-org/dendrite/appservice/api" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - fedsenderapi "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/internal/pushrules" + appserviceAPI "github.com/element-hq/dendrite/appservice/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + fedsenderapi "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/internal/pushrules" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" "github.com/sirupsen/logrus" "golang.org/x/crypto/bcrypt" - clientapi "github.com/matrix-org/dendrite/clientapi/api" - "github.com/matrix-org/dendrite/clientapi/userutil" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/internal/pushgateway" - "github.com/matrix-org/dendrite/internal/sqlutil" - rsapi "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/config" - synctypes "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/producers" - "github.com/matrix-org/dendrite/userapi/storage" - "github.com/matrix-org/dendrite/userapi/storage/tables" - userapiUtil "github.com/matrix-org/dendrite/userapi/util" + clientapi "github.com/element-hq/dendrite/clientapi/api" + "github.com/element-hq/dendrite/clientapi/userutil" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/internal/pushgateway" + "github.com/element-hq/dendrite/internal/sqlutil" + rsapi "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/config" + synctypes "github.com/element-hq/dendrite/syncapi/types" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/producers" + "github.com/element-hq/dendrite/userapi/storage" + "github.com/element-hq/dendrite/userapi/storage/tables" + userapiUtil "github.com/element-hq/dendrite/userapi/util" ) type UserInternalAPI struct { diff --git a/userapi/producers/keychange.go b/userapi/producers/keychange.go index 79b7cf80e..2ff35222c 100644 --- a/userapi/producers/keychange.go +++ b/userapi/producers/keychange.go @@ -10,9 +10,9 @@ import ( "context" "encoding/json" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage" "github.com/nats-io/nats.go" "github.com/sirupsen/logrus" ) diff --git a/userapi/producers/syncapi.go b/userapi/producers/syncapi.go index 165de8994..cf55bda45 100644 --- a/userapi/producers/syncapi.go +++ b/userapi/producers/syncapi.go @@ -8,9 +8,9 @@ import ( "github.com/nats-io/nats.go" log "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal/eventutil" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/userapi/storage" + "github.com/element-hq/dendrite/internal/eventutil" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/userapi/storage" ) type JetStreamPublisher interface { diff --git a/userapi/storage/interface.go b/userapi/storage/interface.go index b0796fbac..bc996f3f5 100644 --- a/userapi/storage/interface.go +++ b/userapi/storage/interface.go @@ -15,12 +15,12 @@ import ( "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" - clientapi "github.com/matrix-org/dendrite/clientapi/api" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/internal/pushrules" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" - "github.com/matrix-org/dendrite/userapi/types" + clientapi "github.com/element-hq/dendrite/clientapi/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/internal/pushrules" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/userapi/types" ) type RegistrationTokens interface { diff --git a/userapi/storage/postgres/account_data_table.go b/userapi/storage/postgres/account_data_table.go index f4e624f9c..36b0745ae 100644 --- a/userapi/storage/postgres/account_data_table.go +++ b/userapi/storage/postgres/account_data_table.go @@ -11,9 +11,9 @@ import ( "database/sql" "encoding/json" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/userapi/storage/postgres/accounts_table.go b/userapi/storage/postgres/accounts_table.go index fc81edd11..6333deb72 100644 --- a/userapi/storage/postgres/accounts_table.go +++ b/userapi/storage/postgres/accounts_table.go @@ -12,11 +12,11 @@ import ( "fmt" "time" - "github.com/matrix-org/dendrite/clientapi/userutil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/postgres/deltas" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/clientapi/userutil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/postgres/deltas" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" log "github.com/sirupsen/logrus" diff --git a/userapi/storage/postgres/cross_signing_keys_table.go b/userapi/storage/postgres/cross_signing_keys_table.go index 6a09bdcf2..56970cd96 100644 --- a/userapi/storage/postgres/cross_signing_keys_table.go +++ b/userapi/storage/postgres/cross_signing_keys_table.go @@ -11,10 +11,10 @@ import ( "database/sql" "fmt" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/storage/tables" - "github.com/matrix-org/dendrite/userapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/userapi/types" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/userapi/storage/postgres/cross_signing_sigs_table.go b/userapi/storage/postgres/cross_signing_sigs_table.go index 0b9bf8e24..a46d092f4 100644 --- a/userapi/storage/postgres/cross_signing_sigs_table.go +++ b/userapi/storage/postgres/cross_signing_sigs_table.go @@ -11,11 +11,11 @@ import ( "database/sql" "fmt" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/storage/postgres/deltas" - "github.com/matrix-org/dendrite/userapi/storage/tables" - "github.com/matrix-org/dendrite/userapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/storage/postgres/deltas" + "github.com/element-hq/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/userapi/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/userapi/storage/postgres/device_keys_table.go b/userapi/storage/postgres/device_keys_table.go index b6950ce97..fb37f3818 100644 --- a/userapi/storage/postgres/device_keys_table.go +++ b/userapi/storage/postgres/device_keys_table.go @@ -13,10 +13,10 @@ import ( "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" ) var deviceKeysSchema = ` diff --git a/userapi/storage/postgres/devices_table.go b/userapi/storage/postgres/devices_table.go index 6e88546a6..a151270bf 100644 --- a/userapi/storage/postgres/devices_table.go +++ b/userapi/storage/postgres/devices_table.go @@ -13,12 +13,12 @@ import ( "time" "github.com/lib/pq" - "github.com/matrix-org/dendrite/clientapi/userutil" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/postgres/deltas" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/clientapi/userutil" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/postgres/deltas" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/userapi/storage/postgres/key_backup_table.go b/userapi/storage/postgres/key_backup_table.go index 3cbc86cc2..a575d984b 100644 --- a/userapi/storage/postgres/key_backup_table.go +++ b/userapi/storage/postgres/key_backup_table.go @@ -11,10 +11,10 @@ import ( "database/sql" "encoding/json" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" ) const keyBackupTableSchema = ` diff --git a/userapi/storage/postgres/key_backup_version_table.go b/userapi/storage/postgres/key_backup_version_table.go index 90ff98614..ea52c8377 100644 --- a/userapi/storage/postgres/key_backup_version_table.go +++ b/userapi/storage/postgres/key_backup_version_table.go @@ -13,8 +13,8 @@ import ( "fmt" "strconv" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/storage/tables" ) const keyBackupVersionTableSchema = ` diff --git a/userapi/storage/postgres/key_changes_table.go b/userapi/storage/postgres/key_changes_table.go index 1fbc39660..8d220f1d1 100644 --- a/userapi/storage/postgres/key_changes_table.go +++ b/userapi/storage/postgres/key_changes_table.go @@ -12,10 +12,10 @@ import ( "errors" "fmt" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/storage/postgres/deltas" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/storage/postgres/deltas" + "github.com/element-hq/dendrite/userapi/storage/tables" ) var keyChangesSchema = ` diff --git a/userapi/storage/postgres/logintoken_table.go b/userapi/storage/postgres/logintoken_table.go index cacfcb37d..ba347b532 100644 --- a/userapi/storage/postgres/logintoken_table.go +++ b/userapi/storage/postgres/logintoken_table.go @@ -11,9 +11,9 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/util" ) diff --git a/userapi/storage/postgres/notifications_table.go b/userapi/storage/postgres/notifications_table.go index a7c1a6421..75f8df039 100644 --- a/userapi/storage/postgres/notifications_table.go +++ b/userapi/storage/postgres/notifications_table.go @@ -14,10 +14,10 @@ import ( log "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/userapi/storage/postgres/one_time_keys_table.go b/userapi/storage/postgres/one_time_keys_table.go index bfd91c54c..57fe5747d 100644 --- a/userapi/storage/postgres/one_time_keys_table.go +++ b/userapi/storage/postgres/one_time_keys_table.go @@ -13,10 +13,10 @@ import ( "time" "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" ) var oneTimeKeysSchema = ` diff --git a/userapi/storage/postgres/openid_table.go b/userapi/storage/postgres/openid_table.go index 345877d11..bd5c329bc 100644 --- a/userapi/storage/postgres/openid_table.go +++ b/userapi/storage/postgres/openid_table.go @@ -5,9 +5,9 @@ import ( "database/sql" "fmt" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" log "github.com/sirupsen/logrus" ) diff --git a/userapi/storage/postgres/profile_table.go b/userapi/storage/postgres/profile_table.go index 8a7163fbf..b74f39709 100644 --- a/userapi/storage/postgres/profile_table.go +++ b/userapi/storage/postgres/profile_table.go @@ -11,10 +11,10 @@ import ( "database/sql" "fmt" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/userapi/storage/postgres/pusher_table.go b/userapi/storage/postgres/pusher_table.go index 64ab56798..91951359d 100644 --- a/userapi/storage/postgres/pusher_table.go +++ b/userapi/storage/postgres/pusher_table.go @@ -13,10 +13,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/userapi/storage/postgres/registration_tokens_table.go b/userapi/storage/postgres/registration_tokens_table.go index 3c3e3fdd9..1c691e0e8 100644 --- a/userapi/storage/postgres/registration_tokens_table.go +++ b/userapi/storage/postgres/registration_tokens_table.go @@ -5,10 +5,10 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/clientapi/api" - internal "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/clientapi/api" + internal "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/storage/tables" "golang.org/x/exp/constraints" ) diff --git a/userapi/storage/postgres/stale_device_lists.go b/userapi/storage/postgres/stale_device_lists.go index f27a3b3c1..4e8740fe2 100644 --- a/userapi/storage/postgres/stale_device_lists.go +++ b/userapi/storage/postgres/stale_device_lists.go @@ -13,11 +13,11 @@ import ( "github.com/lib/pq" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/userapi/storage/postgres/stats_table.go b/userapi/storage/postgres/stats_table.go index 99787c070..195a73577 100644 --- a/userapi/storage/postgres/stats_table.go +++ b/userapi/storage/postgres/stats_table.go @@ -15,11 +15,11 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" - "github.com/matrix-org/dendrite/userapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/userapi/types" ) const userDailyVisitsSchema = ` diff --git a/userapi/storage/postgres/storage.go b/userapi/storage/postgres/storage.go index 2754329d1..035d9b516 100644 --- a/userapi/storage/postgres/storage.go +++ b/userapi/storage/postgres/storage.go @@ -12,10 +12,10 @@ import ( "fmt" "time" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/userapi/storage/postgres/deltas" - "github.com/matrix-org/dendrite/userapi/storage/shared" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/userapi/storage/postgres/deltas" + "github.com/element-hq/dendrite/userapi/storage/shared" "github.com/matrix-org/gomatrixserverlib/spec" // Import the postgres database driver. diff --git a/userapi/storage/postgres/threepid_table.go b/userapi/storage/postgres/threepid_table.go index eec7af881..5ddfdf7fc 100644 --- a/userapi/storage/postgres/threepid_table.go +++ b/userapi/storage/postgres/threepid_table.go @@ -10,12 +10,12 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" ) const threepidSchema = ` diff --git a/userapi/storage/shared/storage.go b/userapi/storage/shared/storage.go index f90ca8e4a..66681f9cf 100644 --- a/userapi/storage/shared/storage.go +++ b/userapi/storage/shared/storage.go @@ -23,13 +23,13 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "golang.org/x/crypto/bcrypt" - clientapi "github.com/matrix-org/dendrite/clientapi/api" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/internal/pushrules" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" - "github.com/matrix-org/dendrite/userapi/types" + clientapi "github.com/element-hq/dendrite/clientapi/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/internal/pushrules" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/userapi/types" ) // Database represents an account database diff --git a/userapi/storage/sqlite3/account_data_table.go b/userapi/storage/sqlite3/account_data_table.go index 9100585f4..50051a29d 100644 --- a/userapi/storage/sqlite3/account_data_table.go +++ b/userapi/storage/sqlite3/account_data_table.go @@ -11,9 +11,9 @@ import ( "database/sql" "encoding/json" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/userapi/storage/sqlite3/accounts_table.go b/userapi/storage/sqlite3/accounts_table.go index 51ee8d06b..e33129b6e 100644 --- a/userapi/storage/sqlite3/accounts_table.go +++ b/userapi/storage/sqlite3/accounts_table.go @@ -11,11 +11,11 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/clientapi/userutil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/sqlite3/deltas" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/clientapi/userutil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" log "github.com/sirupsen/logrus" diff --git a/userapi/storage/sqlite3/cross_signing_keys_table.go b/userapi/storage/sqlite3/cross_signing_keys_table.go index 01b4bbe79..3bad0fae1 100644 --- a/userapi/storage/sqlite3/cross_signing_keys_table.go +++ b/userapi/storage/sqlite3/cross_signing_keys_table.go @@ -11,10 +11,10 @@ import ( "database/sql" "fmt" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/storage/tables" - "github.com/matrix-org/dendrite/userapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/userapi/types" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/userapi/storage/sqlite3/cross_signing_sigs_table.go b/userapi/storage/sqlite3/cross_signing_sigs_table.go index 6246c67a8..19031962c 100644 --- a/userapi/storage/sqlite3/cross_signing_sigs_table.go +++ b/userapi/storage/sqlite3/cross_signing_sigs_table.go @@ -11,11 +11,11 @@ import ( "database/sql" "fmt" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/storage/sqlite3/deltas" - "github.com/matrix-org/dendrite/userapi/storage/tables" - "github.com/matrix-org/dendrite/userapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/userapi/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/userapi/storage/sqlite3/device_keys_table.go b/userapi/storage/sqlite3/device_keys_table.go index f2114a115..05710e5d0 100644 --- a/userapi/storage/sqlite3/device_keys_table.go +++ b/userapi/storage/sqlite3/device_keys_table.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" ) var deviceKeysSchema = ` diff --git a/userapi/storage/sqlite3/devices_table.go b/userapi/storage/sqlite3/devices_table.go index d0c6f8d8e..03f0d9595 100644 --- a/userapi/storage/sqlite3/devices_table.go +++ b/userapi/storage/sqlite3/devices_table.go @@ -12,14 +12,14 @@ import ( "strings" "time" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/sqlite3/deltas" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/clientapi/userutil" + "github.com/element-hq/dendrite/clientapi/userutil" ) const devicesSchema = ` diff --git a/userapi/storage/sqlite3/key_backup_table.go b/userapi/storage/sqlite3/key_backup_table.go index 4a2092a96..9a9d8c51a 100644 --- a/userapi/storage/sqlite3/key_backup_table.go +++ b/userapi/storage/sqlite3/key_backup_table.go @@ -11,10 +11,10 @@ import ( "database/sql" "encoding/json" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" ) const keyBackupTableSchema = ` diff --git a/userapi/storage/sqlite3/key_backup_version_table.go b/userapi/storage/sqlite3/key_backup_version_table.go index 179dc1f9a..c50b81672 100644 --- a/userapi/storage/sqlite3/key_backup_version_table.go +++ b/userapi/storage/sqlite3/key_backup_version_table.go @@ -13,8 +13,8 @@ import ( "fmt" "strconv" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/storage/tables" ) const keyBackupVersionTableSchema = ` diff --git a/userapi/storage/sqlite3/key_changes_table.go b/userapi/storage/sqlite3/key_changes_table.go index 398235943..71f54061d 100644 --- a/userapi/storage/sqlite3/key_changes_table.go +++ b/userapi/storage/sqlite3/key_changes_table.go @@ -12,10 +12,10 @@ import ( "errors" "fmt" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/storage/sqlite3/deltas" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/userapi/storage/tables" ) var keyChangesSchema = ` diff --git a/userapi/storage/sqlite3/logintoken_table.go b/userapi/storage/sqlite3/logintoken_table.go index b0e8b5c90..e8f7545d3 100644 --- a/userapi/storage/sqlite3/logintoken_table.go +++ b/userapi/storage/sqlite3/logintoken_table.go @@ -11,9 +11,9 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/util" ) diff --git a/userapi/storage/sqlite3/notifications_table.go b/userapi/storage/sqlite3/notifications_table.go index e2d44e52a..e80f07b51 100644 --- a/userapi/storage/sqlite3/notifications_table.go +++ b/userapi/storage/sqlite3/notifications_table.go @@ -14,10 +14,10 @@ import ( log "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/userapi/storage/sqlite3/one_time_keys_table.go b/userapi/storage/sqlite3/one_time_keys_table.go index f160e778c..0823ab0b6 100644 --- a/userapi/storage/sqlite3/one_time_keys_table.go +++ b/userapi/storage/sqlite3/one_time_keys_table.go @@ -12,10 +12,10 @@ import ( "encoding/json" "time" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" ) var oneTimeKeysSchema = ` diff --git a/userapi/storage/sqlite3/openid_table.go b/userapi/storage/sqlite3/openid_table.go index def0074d2..863694567 100644 --- a/userapi/storage/sqlite3/openid_table.go +++ b/userapi/storage/sqlite3/openid_table.go @@ -5,9 +5,9 @@ import ( "database/sql" "fmt" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" log "github.com/sirupsen/logrus" ) diff --git a/userapi/storage/sqlite3/profile_table.go b/userapi/storage/sqlite3/profile_table.go index ea6649c07..4c453d2bb 100644 --- a/userapi/storage/sqlite3/profile_table.go +++ b/userapi/storage/sqlite3/profile_table.go @@ -11,10 +11,10 @@ import ( "database/sql" "fmt" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/userapi/storage/sqlite3/pusher_table.go b/userapi/storage/sqlite3/pusher_table.go index 3c79d289a..f5e080538 100644 --- a/userapi/storage/sqlite3/pusher_table.go +++ b/userapi/storage/sqlite3/pusher_table.go @@ -13,10 +13,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/userapi/storage/sqlite3/registration_tokens_table.go b/userapi/storage/sqlite3/registration_tokens_table.go index 897954731..302eafbd0 100644 --- a/userapi/storage/sqlite3/registration_tokens_table.go +++ b/userapi/storage/sqlite3/registration_tokens_table.go @@ -5,10 +5,10 @@ import ( "database/sql" "time" - "github.com/matrix-org/dendrite/clientapi/api" - internal "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/clientapi/api" + internal "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/storage/tables" "golang.org/x/exp/constraints" ) diff --git a/userapi/storage/sqlite3/stale_device_lists.go b/userapi/storage/sqlite3/stale_device_lists.go index 3eb9f9cb7..c6c265227 100644 --- a/userapi/storage/sqlite3/stale_device_lists.go +++ b/userapi/storage/sqlite3/stale_device_lists.go @@ -12,11 +12,11 @@ import ( "strings" "time" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/userapi/storage/sqlite3/stats_table.go b/userapi/storage/sqlite3/stats_table.go index deb73bd3d..b7262fae3 100644 --- a/userapi/storage/sqlite3/stats_table.go +++ b/userapi/storage/sqlite3/stats_table.go @@ -15,11 +15,11 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/tables" - "github.com/matrix-org/dendrite/userapi/types" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/userapi/types" ) const userDailyVisitsSchema = ` diff --git a/userapi/storage/sqlite3/storage.go b/userapi/storage/sqlite3/storage.go index 604406709..b827d895f 100644 --- a/userapi/storage/sqlite3/storage.go +++ b/userapi/storage/sqlite3/storage.go @@ -12,12 +12,12 @@ import ( "fmt" "time" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/userapi/storage/shared" - "github.com/matrix-org/dendrite/userapi/storage/sqlite3/deltas" + "github.com/element-hq/dendrite/userapi/storage/shared" + "github.com/element-hq/dendrite/userapi/storage/sqlite3/deltas" ) // NewUserDatabase creates a new accounts and profiles database diff --git a/userapi/storage/sqlite3/threepid_table.go b/userapi/storage/sqlite3/threepid_table.go index d6af17fa3..e0723f8f6 100644 --- a/userapi/storage/sqlite3/threepid_table.go +++ b/userapi/storage/sqlite3/threepid_table.go @@ -10,12 +10,12 @@ import ( "context" "database/sql" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" ) const threepidSchema = ` diff --git a/userapi/storage/storage.go b/userapi/storage/storage.go index c99b74769..ceb2178ed 100644 --- a/userapi/storage/storage.go +++ b/userapi/storage/storage.go @@ -14,12 +14,12 @@ import ( "fmt" "time" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/userapi/storage/postgres" - "github.com/matrix-org/dendrite/userapi/storage/sqlite3" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/userapi/storage/postgres" + "github.com/element-hq/dendrite/userapi/storage/sqlite3" ) // NewUserDatabase opens a new Postgres or Sqlite database (based on dataSourceName scheme) diff --git a/userapi/storage/storage_test.go b/userapi/storage/storage_test.go index 5a789dfd7..68198b379 100644 --- a/userapi/storage/storage_test.go +++ b/userapi/storage/storage_test.go @@ -10,23 +10,23 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/synctypes" - "github.com/matrix-org/dendrite/userapi/types" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/userapi/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" "github.com/stretchr/testify/assert" "golang.org/x/crypto/bcrypt" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/internal/pushrules" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/internal/pushrules" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage" + "github.com/element-hq/dendrite/userapi/storage/tables" ) const loginTokenLifetime = time.Minute diff --git a/userapi/storage/storage_wasm.go b/userapi/storage/storage_wasm.go index d555054cb..058d2c29b 100644 --- a/userapi/storage/storage_wasm.go +++ b/userapi/storage/storage_wasm.go @@ -11,9 +11,9 @@ import ( "fmt" "time" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/userapi/storage/sqlite3" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/userapi/storage/sqlite3" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/userapi/storage/tables/interface.go b/userapi/storage/tables/interface.go index 61a241785..76cafe250 100644 --- a/userapi/storage/tables/interface.go +++ b/userapi/storage/tables/interface.go @@ -12,14 +12,14 @@ import ( "encoding/json" "time" - "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" - clientapi "github.com/matrix-org/dendrite/clientapi/api" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/userapi/types" + clientapi "github.com/element-hq/dendrite/clientapi/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/userapi/types" ) type RegistrationTokensTable interface { diff --git a/userapi/storage/tables/stale_device_lists_test.go b/userapi/storage/tables/stale_device_lists_test.go index 09924eb08..a8a9368dc 100644 --- a/userapi/storage/tables/stale_device_lists_test.go +++ b/userapi/storage/tables/stale_device_lists_test.go @@ -4,15 +4,15 @@ import ( "context" "testing" - "github.com/matrix-org/dendrite/userapi/storage/postgres" - "github.com/matrix-org/dendrite/userapi/storage/sqlite3" + "github.com/element-hq/dendrite/userapi/storage/postgres" + "github.com/element-hq/dendrite/userapi/storage/sqlite3" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/userapi/storage/tables" ) func mustCreateTable(t *testing.T, dbType test.DBType) (tab tables.StaleDeviceLists, close func()) { diff --git a/userapi/storage/tables/stats_table_test.go b/userapi/storage/tables/stats_table_test.go index 61fe02663..0c98c932d 100644 --- a/userapi/storage/tables/stats_table_test.go +++ b/userapi/storage/tables/stats_table_test.go @@ -11,14 +11,14 @@ import ( "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/postgres" - "github.com/matrix-org/dendrite/userapi/storage/sqlite3" - "github.com/matrix-org/dendrite/userapi/storage/tables" - "github.com/matrix-org/dendrite/userapi/types" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage/postgres" + "github.com/element-hq/dendrite/userapi/storage/sqlite3" + "github.com/element-hq/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/userapi/types" ) func mustMakeDBs(t *testing.T, dbType test.DBType) ( diff --git a/userapi/userapi.go b/userapi/userapi.go index c25b5bbda..cddf33428 100644 --- a/userapi/userapi.go +++ b/userapi/userapi.go @@ -9,23 +9,23 @@ package userapi import ( "time" - fedsenderapi "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/federationapi/statistics" - "github.com/matrix-org/dendrite/internal/pushgateway" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/process" + fedsenderapi "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/federationapi/statistics" + "github.com/element-hq/dendrite/internal/pushgateway" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/process" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/sirupsen/logrus" - rsapi "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/consumers" - "github.com/matrix-org/dendrite/userapi/internal" - "github.com/matrix-org/dendrite/userapi/producers" - "github.com/matrix-org/dendrite/userapi/storage" - "github.com/matrix-org/dendrite/userapi/util" + rsapi "github.com/element-hq/dendrite/roomserver/api" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/consumers" + "github.com/element-hq/dendrite/userapi/internal" + "github.com/element-hq/dendrite/userapi/producers" + "github.com/element-hq/dendrite/userapi/storage" + "github.com/element-hq/dendrite/userapi/util" ) // NewInternalAPI returns a concrete implementation of the internal API. Callers diff --git a/userapi/userapi_test.go b/userapi/userapi_test.go index 495bd6aaf..6f3d801f6 100644 --- a/userapi/userapi_test.go +++ b/userapi/userapi_test.go @@ -14,10 +14,10 @@ import ( "testing" "time" - api2 "github.com/matrix-org/dendrite/appservice/api" - "github.com/matrix-org/dendrite/clientapi/auth/authtypes" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/userapi/producers" + api2 "github.com/element-hq/dendrite/appservice/api" + "github.com/element-hq/dendrite/clientapi/auth/authtypes" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/userapi/producers" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" @@ -25,12 +25,12 @@ import ( "github.com/nats-io/nats.go" "golang.org/x/crypto/bcrypt" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/internal" - "github.com/matrix-org/dendrite/userapi/storage" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/internal" + "github.com/element-hq/dendrite/userapi/storage" ) const ( @@ -168,7 +168,7 @@ func TestQueryProfile(t *testing.T) { // TestPasswordlessLoginFails ensures that a passwordless account cannot // be logged into using an arbitrary password (effectively a regression test -// for https://github.com/matrix-org/dendrite/issues/2780). +// for https://github.com/element-hq/dendrite/issues/2780). func TestPasswordlessLoginFails(t *testing.T) { ctx := context.Background() test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) { diff --git a/userapi/util/devices.go b/userapi/util/devices.go index 117da08ea..a5d9cae19 100644 --- a/userapi/util/devices.go +++ b/userapi/util/devices.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/matrix-org/dendrite/internal/pushgateway" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage" + "github.com/element-hq/dendrite/internal/pushgateway" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage" "github.com/matrix-org/gomatrixserverlib/spec" log "github.com/sirupsen/logrus" ) diff --git a/userapi/util/notify.go b/userapi/util/notify.go index 45d37525c..6d3eeacae 100644 --- a/userapi/util/notify.go +++ b/userapi/util/notify.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "github.com/matrix-org/dendrite/internal/pushgateway" - "github.com/matrix-org/dendrite/userapi/storage" - "github.com/matrix-org/dendrite/userapi/storage/tables" + "github.com/element-hq/dendrite/internal/pushgateway" + "github.com/element-hq/dendrite/userapi/storage" + "github.com/element-hq/dendrite/userapi/storage/tables" "github.com/matrix-org/gomatrixserverlib/spec" log "github.com/sirupsen/logrus" ) diff --git a/userapi/util/notify_test.go b/userapi/util/notify_test.go index 2ea978d69..2844ef636 100644 --- a/userapi/util/notify_test.go +++ b/userapi/util/notify_test.go @@ -8,19 +8,19 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/syncapi/synctypes" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/syncapi/synctypes" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" "golang.org/x/crypto/bcrypt" - "github.com/matrix-org/dendrite/internal/pushgateway" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage" - userUtil "github.com/matrix-org/dendrite/userapi/util" + "github.com/element-hq/dendrite/internal/pushgateway" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/userapi/api" + "github.com/element-hq/dendrite/userapi/storage" + userUtil "github.com/element-hq/dendrite/userapi/util" ) func queryUserIDForSender(senderID spec.SenderID) (*spec.UserID, error) { diff --git a/userapi/util/phonehomestats.go b/userapi/util/phonehomestats.go index f04b93d3c..a913c0728 100644 --- a/userapi/util/phonehomestats.go +++ b/userapi/util/phonehomestats.go @@ -18,9 +18,9 @@ import ( "github.com/sirupsen/logrus" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/userapi/storage" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/userapi/storage" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/userapi/util/phonehomestats_test.go b/userapi/util/phonehomestats_test.go index 191a35c04..7b52c1852 100644 --- a/userapi/util/phonehomestats_test.go +++ b/userapi/util/phonehomestats_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/internal/sqlutil" "golang.org/x/crypto/bcrypt" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/test/testrig" - "github.com/matrix-org/dendrite/userapi/storage" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/test/testrig" + "github.com/element-hq/dendrite/userapi/storage" ) func TestCollect(t *testing.T) { From 891950f7b601ae5cf7da997f58957756da916614 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Thu, 17 Oct 2024 17:34:12 +0200 Subject: [PATCH 07/13] Replace references to the repository --- .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md | 2 +- .github/workflows/dendrite.yml | 34 +++++++++---------- README.md | 12 +++---- clientapi/README.md | 2 +- dendrite-sample.yaml | 5 ++- docs/FAQ.md | 16 ++++----- docs/_config.yml | 2 +- docs/development/CONTRIBUTING.md | 14 ++++---- docs/development/sytest.md | 2 +- docs/installation/1_planning.md | 4 +-- docs/installation/docker/1_docker.md | 4 +-- docs/installation/helm/1_helm.md | 6 ++-- docs/installation/manual/4_configuration.md | 10 +++--- helm/dendrite/Chart.yaml | 4 +-- helm/dendrite/README.md | 8 ++--- .../grafana_dashboards/dendrite-rev2.json | 29 ++++------------ helm/dendrite/templates/_helpers.tpl | 4 +-- helm/dendrite/values.yaml | 11 +++--- 18 files changed, 77 insertions(+), 92 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md index 084f683bd..5f9714a5f 100644 --- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md +++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md @@ -6,7 +6,7 @@ about: Suggest an idea for this project **Description:** diff --git a/.github/workflows/dendrite.yml b/.github/workflows/dendrite.yml index d9c883dab..9c7a1fdc9 100644 --- a/.github/workflows/dendrite.yml +++ b/.github/workflows/dendrite.yml @@ -5,14 +5,14 @@ on: branches: - main paths: - - '**.go' # only execute on changes to go files - - 'go.sum' # or dependency updates - - '.github/workflows/**' # or workflow changes + - "**.go" # only execute on changes to go files + - "go.sum" # or dependency updates + - ".github/workflows/**" # or workflow changes pull_request: paths: - - '**.go' - - 'go.sum' # or dependency updates - - '.github/workflows/**' + - "**.go" + - "go.sum" # or dependency updates + - ".github/workflows/**" release: types: [published] workflow_dispatch: @@ -33,7 +33,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version-file: 'go.mod' + go-version-file: "go.mod" cache: true - name: Install Node @@ -72,7 +72,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version-file: 'go.mod' + go-version-file: "go.mod" - name: golangci-lint uses: golangci/golangci-lint-action@v3 @@ -108,7 +108,7 @@ jobs: - name: Setup go uses: actions/setup-go@v4 with: - go-version-file: 'go.mod' + go-version-file: "go.mod" - uses: actions/cache@v4 # manually set up caches, as they otherwise clash with different steps using setup-go with cache=true with: @@ -145,7 +145,7 @@ jobs: - name: Setup go uses: actions/setup-go@v4 with: - go-version-file: 'go.mod' + go-version-file: "go.mod" - uses: actions/cache@v4 with: path: | @@ -178,7 +178,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version-file: 'go.mod' + go-version-file: "go.mod" - uses: actions/cache@v4 with: path: | @@ -241,7 +241,7 @@ jobs: - name: Setup go uses: actions/setup-go@v4 with: - go-version-file: 'go.mod' + go-version-file: "go.mod" - name: Set up gotestfmt uses: gotesttools/gotestfmt-action@v2 with: @@ -279,7 +279,7 @@ jobs: - name: Setup go uses: actions/setup-go@v4 with: - go-version-file: 'go.mod' + go-version-file: "go.mod" cache: true - uses: actions/cache@v4 with: @@ -309,7 +309,7 @@ jobs: - name: Setup go uses: actions/setup-go@v4 with: - go-version-file: 'go.mod' + go-version-file: "go.mod" cache: true - uses: actions/cache@v4 with: @@ -474,7 +474,7 @@ jobs: upgrade_test_direct, sytest, complement, - integration + integration, ] runs-on: ubuntu-latest if: ${{ !cancelled() }} # Run this even if prior jobs were skipped @@ -490,8 +490,8 @@ jobs: packages: write contents: read security-events: write # To upload Trivy sarif files - if: github.repository == 'matrix-org/dendrite' && github.ref_name == 'main' + if: github.repository == 'element-hq/dendrite' && github.ref_name == 'main' needs: [integration-tests-done] - uses: matrix-org/dendrite/.github/workflows/docker.yml@main + uses: element-hq/dendrite/.github/workflows/docker.yml@main secrets: DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} diff --git a/README.md b/README.md index 2bae96fec..8b53a8999 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Dendrite -[![Build status](https://github.com/matrix-org/dendrite/actions/workflows/dendrite.yml/badge.svg?event=push)](https://github.com/matrix-org/dendrite/actions/workflows/dendrite.yml) [![Dendrite](https://img.shields.io/matrix/dendrite:matrix.org.svg?label=%23dendrite%3Amatrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#dendrite:matrix.org) [![Dendrite Dev](https://img.shields.io/matrix/dendrite-dev:matrix.org.svg?label=%23dendrite-dev%3Amatrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#dendrite-dev:matrix.org) +[![Build status](https://github.com/element-hq/dendrite/actions/workflows/dendrite.yml/badge.svg?event=push)](https://github.com/element-hq/dendrite/actions/workflows/dendrite.yml) [![Dendrite](https://img.shields.io/matrix/dendrite:matrix.org.svg?label=%23dendrite%3Amatrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#dendrite:matrix.org) [![Dendrite Dev](https://img.shields.io/matrix/dendrite-dev:matrix.org.svg?label=%23dendrite-dev%3Amatrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#dendrite-dev:matrix.org) Dendrite is a second-generation Matrix homeserver written in Go. It intends to provide an **efficient**, **reliable** and **scalable** alternative to [Synapse](https://github.com/matrix-org/synapse): @@ -47,7 +47,7 @@ For a usable federating Dendrite deployment, you will also need: Also recommended are: - A PostgreSQL database engine, which will perform better than SQLite with many users and/or larger rooms -- A reverse proxy server, such as nginx, configured [like this sample](https://github.com/matrix-org/dendrite/blob/main/docs/nginx/dendrite-sample.conf) +- A reverse proxy server, such as nginx, configured [like this sample](https://github.com/element-hq/dendrite/blob/main/docs/nginx/dendrite-sample.conf) The [Federation Tester](https://federationtester.matrix.org) can be used to verify your deployment. @@ -58,7 +58,7 @@ If you wish to build a fully-federating Dendrite instance, see [the Installation The following instructions are enough to get Dendrite started as a non-federating test deployment using self-signed certificates and SQLite databases: ```bash -$ git clone https://github.com/matrix-org/dendrite +$ git clone https://github.com/element-hq/dendrite $ cd dendrite $ go build -o bin/ ./cmd/... @@ -116,12 +116,12 @@ This means Dendrite supports amongst others: ## Contributing We would be grateful for any help on issues marked as -[Are We Synapse Yet](https://github.com/matrix-org/dendrite/labels/are-we-synapse-yet). These issues +[Are We Synapse Yet](https://github.com/element-hq/dendrite/labels/are-we-synapse-yet). These issues all have related Sytests which need to pass in order for the issue to be closed. Once you've written your code, you can quickly run Sytest to ensure that the test names are now passing. If you're new to the project, see our [Contributing page](https://matrix-org.github.io/dendrite/development/contributing) to get up to speed, then -look for [Good First Issues](https://github.com/matrix-org/dendrite/labels/good%20first%20issue). If you're -familiar with the project, look for [Help Wanted](https://github.com/matrix-org/dendrite/labels/help-wanted) +look for [Good First Issues](https://github.com/element-hq/dendrite/labels/good%20first%20issue). If you're +familiar with the project, look for [Help Wanted](https://github.com/element-hq/dendrite/labels/help-wanted) issues. diff --git a/clientapi/README.md b/clientapi/README.md index 6d4a9dce4..48ae6a87a 100644 --- a/clientapi/README.md +++ b/clientapi/README.md @@ -1,4 +1,4 @@ -This component roughly corresponds to "Client Room Send" and "Client Sync" on [the WIRING diagram](https://github.com/matrix-org/dendrite/blob/master/WIRING.md). +This component roughly corresponds to "Client Room Send" and "Client Sync" on [the WIRING diagram](https://github.com/element-hq/dendrite/blob/master/WIRING.md). This component produces multiple binaries. ## Internals diff --git a/dendrite-sample.yaml b/dendrite-sample.yaml index 8616e120e..0ee381f02 100644 --- a/dendrite-sample.yaml +++ b/dendrite-sample.yaml @@ -188,14 +188,13 @@ client_api: recaptcha_public_key: "" recaptcha_private_key: "" recaptcha_bypass_secret: "" - + # To use hcaptcha.com instead of ReCAPTCHA, set the following parameters, otherwise just keep them empty. # recaptcha_siteverify_api: "https://hcaptcha.com/siteverify" # recaptcha_api_js_url: "https://js.hcaptcha.com/1/api.js" # recaptcha_form_field: "h-captcha-response" # recaptcha_sitekey_class: "h-captcha" - # TURN server information that this homeserver should send to clients. turn: turn_user_lifetime: "5m" @@ -337,7 +336,7 @@ user_api: # worker_count: 8 # Configuration for Opentracing. -# See https://github.com/matrix-org/dendrite/tree/master/docs/tracing for information on +# See https://github.com/element-hq/dendrite/tree/master/docs/tracing for information on # how this works and how to set it up. tracing: enabled: false diff --git a/docs/FAQ.md b/docs/FAQ.md index 2ef9e6c2b..a7ba979e2 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -18,13 +18,13 @@ Mostly, although there are still bugs and missing features. If you are a confide ## Is Dendrite feature-complete? -No, although a good portion of the Matrix specification has been implemented. Mostly missing are client features - see the [readme](https://github.com/matrix-org/dendrite/blob/main/README.md) at the root of the repository for more information. +No, although a good portion of the Matrix specification has been implemented. Mostly missing are client features - see the [readme](https://github.com/element-hq/dendrite/blob/main/README.md) at the root of the repository for more information. ## Why doesn't Dendrite have "x" yet? -Dendrite development is currently supported by a small team of developers and due to those limited resources, the majority of the effort is focused on getting Dendrite to be -specification complete. If there are major features you're requesting (e.g. new administration endpoints), we'd like to strongly encourage you to join the community in supporting -the development efforts through [contributing](./development/CONTRIBUTING.md). +Dendrite development is currently supported by a small team of developers and due to those limited resources, the majority of the effort is focused on getting Dendrite to be +specification complete. If there are major features you're requesting (e.g. new administration endpoints), we'd like to strongly encourage you to join the community in supporting +the development efforts through [contributing](./development/CONTRIBUTING.md). ## Is there a migration path from Synapse to Dendrite? @@ -37,7 +37,7 @@ No, Dendrite has a very different database schema to Synapse and the two are not ## Can I configure which port Dendrite listens on? -Yes, use the cli flag `-http-bind-address`. +Yes, use the cli flag `-http-bind-address`. ## I've installed Dendrite but federation isn't working @@ -130,9 +130,9 @@ We don't officially support this or any other dedicated media storage solutions. ## Is there an upgrade guide for Dendrite? -Run a newer docker image. We don't officially support deployments other than Docker. -Most of the time you should be able to just -- stop +Run a newer docker image. We don't officially support deployments other than Docker. +Most of the time you should be able to just +- stop - replace binary - start diff --git a/docs/_config.yml b/docs/_config.yml index ed93fd796..7af680398 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -10,7 +10,7 @@ plugins: - jekyll-feed aux_links: "GitHub": - - "//github.com/matrix-org/dendrite" + - "//github.com/element-hq/dendrite" aux_links_new_tab: true sass: sass_dir: _sass diff --git a/docs/development/CONTRIBUTING.md b/docs/development/CONTRIBUTING.md index caab1e749..0d6f533c4 100644 --- a/docs/development/CONTRIBUTING.md +++ b/docs/development/CONTRIBUTING.md @@ -101,7 +101,7 @@ We also have unit tests which we run via: DENDRITE_TEST_SKIP_NODB=1 go test --race ./... ``` -This only runs SQLite database tests. If you wish to execute Postgres tests as well, you'll either need to +This only runs SQLite database tests. If you wish to execute Postgres tests as well, you'll either need to have Postgres installed locally (`createdb` will be used) or have a remote/containerized Postgres instance available. @@ -119,7 +119,7 @@ code is functioning as intended is great, and to ensure that we will find out qu in the future if any regressions happen. We use the standard [Go testing package](https://gobyexample.com/testing) for this, -alongside some helper functions in our own [`test` package](https://pkg.go.dev/github.com/matrix-org/dendrite/test). +alongside some helper functions in our own [`test` package](https://pkg.go.dev/github.com/element-hq/dendrite/test). ## Continuous integration @@ -131,7 +131,7 @@ test suites ([Complement](https://github.com/matrix-org/complement) and [SyTest](https://github.com/matrix-org/sytest)). You can see the progress of any CI jobs at the bottom of the Pull Request page, or by -looking at the [Actions](https://github.com/matrix-org/dendrite/actions) tab of the Dendrite +looking at the [Actions](https://github.com/element-hq/dendrite/actions) tab of the Dendrite repository. We generally won't accept a submission unless all of the CI jobs are passing. We @@ -152,7 +152,7 @@ significant amount of CPU and RAM. Once the code builds, run [Sytest](https://github.com/matrix-org/sytest) according to the guide in -[docs/development/sytest.md](https://github.com/matrix-org/dendrite/blob/main/docs/development/sytest.md#using-a-sytest-docker-image) +[docs/development/sytest.md](https://github.com/element-hq/dendrite/blob/main/docs/development/sytest.md#using-a-sytest-docker-image) so you can see whether something is being broken and whether there are newly passing tests. @@ -162,17 +162,17 @@ tests. ## Picking things to do If you're new then feel free to pick up an issue labelled [good first -issue](https://github.com/matrix-org/dendrite/labels/good%20first%20issue). +issue](https://github.com/element-hq/dendrite/labels/good%20first%20issue). These should be well-contained, small pieces of work that can be picked up to help you get familiar with the code base. Once you're comfortable with hacking on Dendrite there are issues labelled as -[help wanted](https://github.com/matrix-org/dendrite/labels/help-wanted), +[help wanted](https://github.com/element-hq/dendrite/labels/help-wanted), these are often slightly larger or more complicated pieces of work but are hopefully nonetheless fairly well-contained. We ask people who are familiar with Dendrite to leave the [good first -issue](https://github.com/matrix-org/dendrite/labels/good%20first%20issue) +issue](https://github.com/element-hq/dendrite/labels/good%20first%20issue) issues so that there is always a way for new people to come and get involved. ## Getting help diff --git a/docs/development/sytest.md b/docs/development/sytest.md index 2f681f3e5..7f2c27e63 100644 --- a/docs/development/sytest.md +++ b/docs/development/sytest.md @@ -28,7 +28,7 @@ go build -o bin/ ./cmd/... ``` If you are fixing an issue marked with -[Are We Synapse Yet](https://github.com/matrix-org/dendrite/labels/are-we-synapse-yet) +[Are We Synapse Yet](https://github.com/element-hq/dendrite/labels/are-we-synapse-yet) then there will be a list of Sytests that you should add to the whitelist when you have fixed that issue. This MUST be included in your PR to ensure that the issue is fully resolved. diff --git a/docs/installation/1_planning.md b/docs/installation/1_planning.md index e113ca2d3..3ae601ef1 100644 --- a/docs/installation/1_planning.md +++ b/docs/installation/1_planning.md @@ -77,8 +77,8 @@ therefore does not need this to be manually installed. A reverse proxy such as [Caddy](https://caddyserver.com), [NGINX](https://www.nginx.com) or [HAProxy](http://www.haproxy.org) is useful for deployments. Configuring this is not covered in this documentation, although sample configurations -for [Caddy](https://github.com/matrix-org/dendrite/blob/main/docs/caddy) and -[NGINX](https://github.com/matrix-org/dendrite/blob/main/docs/nginx) are provided. +for [Caddy](https://github.com/element-hq/dendrite/blob/main/docs/caddy) and +[NGINX](https://github.com/element-hq/dendrite/blob/main/docs/nginx) are provided. ### Windows diff --git a/docs/installation/docker/1_docker.md b/docs/installation/docker/1_docker.md index f33999725..85de694f7 100644 --- a/docs/installation/docker/1_docker.md +++ b/docs/installation/docker/1_docker.md @@ -9,7 +9,7 @@ permalink: /installation/docker/install # Installing Dendrite using Docker Compose -Dendrite provides an [example](https://github.com/matrix-org/dendrite/blob/main/build/docker/docker-compose.yml) +Dendrite provides an [example](https://github.com/element-hq/dendrite/blob/main/build/docker/docker-compose.yml) Docker compose file, which needs some preparation to start successfully. Please note that this compose file only has Postgres as a dependency, and you need to configure a [reverse proxy](../planning#reverse-proxy). @@ -57,5 +57,5 @@ You can then change `config/dendrite.yaml` to your liking. Once you're done changing the config, you can now start up Dendrite with ```bash -docker-compose -f docker-compose.yml up +docker-compose -f docker-compose.yml up ``` diff --git a/docs/installation/helm/1_helm.md b/docs/installation/helm/1_helm.md index 00fe4fdca..57de4ca56 100644 --- a/docs/installation/helm/1_helm.md +++ b/docs/installation/helm/1_helm.md @@ -16,8 +16,8 @@ helm repo add dendrite https://matrix-org.github.io/dendrite/ helm repo update ``` -Next you'll need to create a `values.yaml` file and configure it to your liking. All possible values can be found -[here](https://github.com/matrix-org/dendrite/blob/main/helm/dendrite/values.yaml), but at least you need to configure +Next you'll need to create a `values.yaml` file and configure it to your liking. All possible values can be found +[here](https://github.com/element-hq/dendrite/blob/main/helm/dendrite/values.yaml), but at least you need to configure a `server_name`, otherwise the chart will complain about it: ```yaml @@ -55,4 +55,4 @@ dendrite_config: server_name: "localhost" ``` -Using this option, the `database.connection_string` will be set for you automatically. \ No newline at end of file +Using this option, the `database.connection_string` will be set for you automatically. diff --git a/docs/installation/manual/4_configuration.md b/docs/installation/manual/4_configuration.md index 624cc4155..23069799c 100644 --- a/docs/installation/manual/4_configuration.md +++ b/docs/installation/manual/4_configuration.md @@ -11,7 +11,7 @@ permalink: /installation/manual/configuration A YAML configuration file is used to configure Dendrite. A sample configuration file is present in the top level of the Dendrite repository: -* [`dendrite-sample.yaml`](https://github.com/matrix-org/dendrite/blob/main/dendrite-sample.yaml) +* [`dendrite-sample.yaml`](https://github.com/element-hq/dendrite/blob/main/dendrite-sample.yaml) You will need to duplicate the sample, calling it `dendrite.yaml` for example, and then tailor it to your installation. At a minimum, you will need to populate the following @@ -81,7 +81,7 @@ one address in the `addresses` field. ## Database connection using a global connection pool -If you want to use a single connection pool to a single PostgreSQL database, +If you want to use a single connection pool to a single PostgreSQL database, then you must uncomment and configure the `database` section within the `global` section: ```yaml @@ -103,9 +103,9 @@ these will override the `global` database configuration. Dendrite supports full-text indexing using [Bleve](https://github.com/blevesearch/bleve). It is configured in the `sync_api` section as follows. -Depending on the language most likely to be used on the server, it might make sense to change the `language` used when indexing, -to ensure the returned results match the expectations. A full list of possible languages -can be found [here](https://github.com/matrix-org/dendrite/blob/5b73592f5a4dddf64184fcbe33f4c1835c656480/internal/fulltext/bleve.go#L25-L46). +Depending on the language most likely to be used on the server, it might make sense to change the `language` used when indexing, +to ensure the returned results match the expectations. A full list of possible languages +can be found [here](https://github.com/element-hq/dendrite/blob/5b73592f5a4dddf64184fcbe33f4c1835c656480/internal/fulltext/bleve.go#L25-L46). ```yaml sync_api: diff --git a/helm/dendrite/Chart.yaml b/helm/dendrite/Chart.yaml index 9613b5045..6f4a9825c 100644 --- a/helm/dendrite/Chart.yaml +++ b/helm/dendrite/Chart.yaml @@ -10,9 +10,9 @@ keywords: - chat - homeserver - dendrite -home: https://github.com/matrix-org/dendrite +home: https://github.com/element-hq/dendrite sources: - - https://github.com/matrix-org/dendrite + - https://github.com/element-hq/dendrite dependencies: - name: postgresql version: 14.2.3 diff --git a/helm/dendrite/README.md b/helm/dendrite/README.md index a5b03aa85..9973c90bc 100644 --- a/helm/dendrite/README.md +++ b/helm/dendrite/README.md @@ -32,7 +32,7 @@ Create a folder `appservices` and place your configurations in there. The confi ## Source Code -* +* ## Requirements | Repository | Name | Version | @@ -42,7 +42,7 @@ Create a folder `appservices` and place your configurations in there. The confi | Key | Type | Default | Description | |-----|------|---------|-------------| -| image.repository | string | `"ghcr.io/matrix-org/dendrite-monolith"` | Docker repository/image to use | +| image.repository | string | `"ghcr.io/element-hq/dendrite-monolith"` | Docker repository/image to use | | image.pullPolicy | string | `"IfNotPresent"` | Kubernetes pullPolicy | | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. | | imagePullSecrets | list | `[]` | Configure image pull secrets to use private container registry https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret | @@ -135,7 +135,7 @@ Create a folder `appservices` and place your configurations in there. The confi | dendrite_config.sync_api.search | object | `{"enabled":true,"index_path":"/data/search","language":"en"}` | Configuration for the full-text search engine. | | dendrite_config.sync_api.search.enabled | bool | `true` | Whether fulltext search is enabled. | | dendrite_config.sync_api.search.index_path | string | `"/data/search"` | The path to store the search index in. | -| dendrite_config.sync_api.search.language | string | `"en"` | The language most likely to be used on the server - used when indexing, to ensure the returned results match expectations. A full list of possible languages can be found [here](https://github.com/matrix-org/dendrite/blob/76db8e90defdfb9e61f6caea8a312c5d60bcc005/internal/fulltext/bleve.go#L25-L46) | +| dendrite_config.sync_api.search.language | string | `"en"` | The language most likely to be used on the server - used when indexing, to ensure the returned results match expectations. A full list of possible languages can be found [here](https://github.com/element-hq/dendrite/blob/76db8e90defdfb9e61f6caea8a312c5d60bcc005/internal/fulltext/bleve.go#L25-L46) | | dendrite_config.user_api.bcrypt_cost | int | `10` | bcrypt cost to use when hashing passwords. (ranges from 4-31; 4 being least secure, 31 being most secure; _NOTE: Using a too high value can cause clients to timeout and uses more CPU._) | | dendrite_config.user_api.openid_token_lifetime_ms | int | `3600000` | OpenID Token lifetime in milliseconds. | | dendrite_config.user_api.push_gateway_disable_tls_validation | bool | `false` | | @@ -191,4 +191,4 @@ grafana: PS: The label `release=kube-prometheus-stack` is setup with the helmchart of the Prometheus Operator. For Grafana Dashboards it may be necessary to enable scanning in the correct namespaces (or ALL), enabled by `sidecar.dashboards.searchNamespace` in [Helmchart of grafana](https://artifacthub.io/packages/helm/grafana/grafana) (which is part of PrometheusOperator, so `grafana.sidecar.dashboards.searchNamespace`) ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) \ No newline at end of file +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/helm/dendrite/grafana_dashboards/dendrite-rev2.json b/helm/dendrite/grafana_dashboards/dendrite-rev2.json index 420d8bf1b..eeb95ff97 100644 --- a/helm/dendrite/grafana_dashboards/dendrite-rev2.json +++ b/helm/dendrite/grafana_dashboards/dendrite-rev2.json @@ -21,7 +21,7 @@ } ] }, - "description": "Dendrite dashboard from https://github.com/matrix-org/dendrite/", + "description": "Dendrite dashboard from https://github.com/element-hq/dendrite/", "editable": true, "fiscalYearStartMonth": 0, "gnetId": 13916, @@ -95,9 +95,7 @@ "justifyMode": "auto", "orientation": "auto", "reduceOptions": { - "calcs": [ - "lastNotNull" - ], + "calcs": ["lastNotNull"], "fields": "", "values": false }, @@ -191,10 +189,7 @@ "id": 6, "options": { "legend": { - "calcs": [ - "mean", - "lastNotNull" - ], + "calcs": ["mean", "lastNotNull"], "displayMode": "table", "placement": "right", "showLegend": true @@ -326,10 +321,7 @@ "id": 10, "options": { "legend": { - "calcs": [ - "mean", - "lastNotNull" - ], + "calcs": ["mean", "lastNotNull"], "displayMode": "table", "placement": "right", "showLegend": true @@ -384,10 +376,7 @@ "refresh": "10s", "schemaVersion": 37, "style": "dark", - "tags": [ - "matrix", - "dendrite" - ], + "tags": ["matrix", "dendrite"], "templating": { "list": [ { @@ -411,12 +400,8 @@ { "current": { "selected": true, - "text": [ - "All" - ], - "value": [ - "$__all" - ] + "text": ["All"], + "value": ["$__all"] }, "datasource": { "type": "prometheus", diff --git a/helm/dendrite/templates/_helpers.tpl b/helm/dendrite/templates/_helpers.tpl index 36bcefd8f..5f782c19d 100644 --- a/helm/dendrite/templates/_helpers.tpl +++ b/helm/dendrite/templates/_helpers.tpl @@ -1,6 +1,6 @@ {{- define "validate.config" }} {{- if and (not .Values.signing_key.create) (eq .Values.signing_key.existingSecret "") -}} -{{- fail "You must create a signing key for configuration.signing_key OR specify an existing secret name in .Values.signing_key.existingSecret to mount it. (see https://github.com/matrix-org/dendrite/blob/master/docs/INSTALL.md#server-key-generation)" -}} +{{- fail "You must create a signing key for configuration.signing_key OR specify an existing secret name in .Values.signing_key.existingSecret to mount it. (see https://github.com/element-hq/dendrite/blob/master/docs/INSTALL.md#server-key-generation)" -}} {{- end -}} {{- if and (not .Values.postgresql.enabled) (eq .Values.dendrite_config.global.database.connection_string "") -}} {{- fail "Database connection string must be set." -}} @@ -65,4 +65,4 @@ Selector labels {{- define "dendrite.selectorLabels" -}} app.kubernetes.io/name: {{ include "dendrite.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/dendrite/values.yaml b/helm/dendrite/values.yaml index 02cd1aa13..b5da4ca5d 100644 --- a/helm/dendrite/values.yaml +++ b/helm/dendrite/values.yaml @@ -1,6 +1,6 @@ image: # -- Docker repository/image to use - repository: "ghcr.io/matrix-org/dendrite-monolith" + repository: "ghcr.io/element-hq/dendrite-monolith" # -- Kubernetes pullPolicy pullPolicy: IfNotPresent # -- Overrides the image tag whose default is the chart appVersion. @@ -250,7 +250,8 @@ dendrite_config: # -- Configuration for experimental MSC's. (Valid values are: msc2836) mscs: - mscs: [] + mscs: + [] # A list of enabled MSC's # Currently valid values are: # - msc2836 (Threading, see https://github.com/matrix-org/matrix-doc/pull/2836) @@ -366,7 +367,7 @@ dendrite_config: index_path: "/data/search" # -- The language most likely to be used on the server - used when indexing, to # ensure the returned results match expectations. A full list of possible languages - # can be found [here](https://github.com/matrix-org/dendrite/blob/76db8e90defdfb9e61f6caea8a312c5d60bcc005/internal/fulltext/bleve.go#L25-L46) + # can be found [here](https://github.com/element-hq/dendrite/blob/76db8e90defdfb9e61f6caea8a312c5d60bcc005/internal/fulltext/bleve.go#L25-L46) language: "en" user_api: @@ -382,8 +383,8 @@ dendrite_config: # -- Default logging configuration logging: - - type: std - level: info + - type: std + level: info postgresql: # -- Enable and configure postgres as the database for dendrite. From 91186179d472e6dd49d401545b6a99d23fc9b4c6 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Fri, 18 Oct 2024 15:06:26 +0200 Subject: [PATCH 08/13] Add commercial license --- LICENSE-COMMERCIAL | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 LICENSE-COMMERCIAL diff --git a/LICENSE-COMMERCIAL b/LICENSE-COMMERCIAL new file mode 100644 index 000000000..39041ce02 --- /dev/null +++ b/LICENSE-COMMERCIAL @@ -0,0 +1,6 @@ +Licensees holding a valid commercial license with Element may use this +software in accordance with the terms contained in a written agreement +between you and Element. + +To purchase a commercial license please contact our sales team at +licensing@element.io From 075b236155493f7c597ea3a680a03edb48c8e076 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Fri, 18 Oct 2024 16:14:08 +0200 Subject: [PATCH 09/13] Update the license headers to mention the commercial license --- Dockerfile | 2 +- appservice/api/query.go | 4 ++-- appservice/appservice.go | 4 ++-- appservice/consumers/roomserver.go | 4 ++-- appservice/query/query.go | 4 ++-- build/dendritejs-pinecone/jsServer.go | 4 ++-- build/dendritejs-pinecone/main.go | 4 ++-- build/dendritejs-pinecone/main_noop.go | 4 ++-- build/dendritejs-pinecone/main_test.go | 4 ++-- build/gobind-pinecone/monolith.go | 4 ++-- build/gobind-pinecone/monolith_test.go | 4 ++-- build/gobind-pinecone/platform_ios.go | 4 ++-- build/gobind-pinecone/platform_other.go | 4 ++-- clientapi/api/api.go | 4 ++-- clientapi/auth/auth.go | 4 ++-- clientapi/auth/authtypes/flow.go | 4 ++-- clientapi/auth/authtypes/membership.go | 4 ++-- clientapi/auth/authtypes/profile.go | 4 ++-- clientapi/auth/authtypes/threepid.go | 4 ++-- clientapi/auth/login.go | 4 ++-- clientapi/auth/login_application_service.go | 4 ++-- clientapi/auth/login_test.go | 4 ++-- clientapi/auth/login_token.go | 4 ++-- clientapi/auth/password.go | 4 ++-- clientapi/auth/user_interactive.go | 4 ++-- clientapi/clientapi.go | 4 ++-- clientapi/httputil/httputil.go | 4 ++-- clientapi/httputil/parse.go | 4 ++-- clientapi/producers/syncapi.go | 4 ++-- clientapi/routing/account_data.go | 4 ++-- clientapi/routing/admin_whois.go | 4 ++-- clientapi/routing/aliases.go | 4 ++-- clientapi/routing/auth_fallback.go | 4 ++-- clientapi/routing/capabilities.go | 4 ++-- clientapi/routing/createroom.go | 4 ++-- clientapi/routing/device.go | 4 ++-- clientapi/routing/directory.go | 4 ++-- clientapi/routing/directory_public.go | 4 ++-- clientapi/routing/joined_rooms.go | 4 ++-- clientapi/routing/joinroom.go | 4 ++-- clientapi/routing/key_backup.go | 4 ++-- clientapi/routing/key_crosssigning.go | 4 ++-- clientapi/routing/keys.go | 4 ++-- clientapi/routing/leaveroom.go | 4 ++-- clientapi/routing/login.go | 4 ++-- clientapi/routing/logout.go | 4 ++-- clientapi/routing/membership.go | 4 ++-- clientapi/routing/memberships.go | 4 ++-- clientapi/routing/notification.go | 4 ++-- clientapi/routing/openid.go | 4 ++-- clientapi/routing/peekroom.go | 4 ++-- clientapi/routing/presence.go | 4 ++-- clientapi/routing/profile.go | 4 ++-- clientapi/routing/pusher.go | 4 ++-- clientapi/routing/receipt.go | 4 ++-- clientapi/routing/redaction.go | 4 ++-- clientapi/routing/register.go | 4 ++-- clientapi/routing/register_test.go | 4 ++-- clientapi/routing/report_event.go | 4 ++-- clientapi/routing/room_hierarchy.go | 4 ++-- clientapi/routing/room_tagging.go | 4 ++-- clientapi/routing/routing.go | 4 ++-- clientapi/routing/sendevent.go | 4 ++-- clientapi/routing/sendtodevice.go | 4 ++-- clientapi/routing/sendtyping.go | 4 ++-- clientapi/routing/server_notices.go | 4 ++-- clientapi/routing/state.go | 4 ++-- clientapi/routing/thirdparty.go | 4 ++-- clientapi/routing/threepid.go | 4 ++-- clientapi/routing/upgrade_room.go | 4 ++-- clientapi/routing/userdirectory.go | 4 ++-- clientapi/routing/voip.go | 4 ++-- clientapi/routing/whoami.go | 4 ++-- clientapi/threepid/invites.go | 4 ++-- clientapi/threepid/threepid.go | 4 ++-- clientapi/userutil/userutil.go | 4 ++-- clientapi/userutil/userutil_test.go | 4 ++-- cmd/create-account/main.go | 4 ++-- cmd/dendrite-demo-pinecone/conduit/conduit.go | 4 ++-- cmd/dendrite-demo-pinecone/conduit/conduit_test.go | 4 ++-- cmd/dendrite-demo-pinecone/conn/client.go | 4 ++-- cmd/dendrite-demo-pinecone/conn/ws.go | 4 ++-- cmd/dendrite-demo-pinecone/defaults/defaults.go | 4 ++-- cmd/dendrite-demo-pinecone/embed/embed_elementweb.go | 4 ++-- cmd/dendrite-demo-pinecone/embed/embed_other.go | 4 ++-- cmd/dendrite-demo-pinecone/main.go | 4 ++-- cmd/dendrite-demo-pinecone/monolith/keys.go | 4 ++-- cmd/dendrite-demo-pinecone/monolith/monolith.go | 4 ++-- cmd/dendrite-demo-pinecone/relay/retriever.go | 4 ++-- cmd/dendrite-demo-pinecone/relay/retriever_test.go | 4 ++-- cmd/dendrite-demo-pinecone/rooms/rooms.go | 4 ++-- cmd/dendrite-demo-pinecone/users/users.go | 4 ++-- cmd/dendrite-demo-yggdrasil/main.go | 4 ++-- cmd/dendrite-demo-yggdrasil/signing/fetcher.go | 4 ++-- cmd/dendrite-demo-yggdrasil/yggconn/node.go | 4 ++-- cmd/dendrite-demo-yggdrasil/yggrooms/yggrooms.go | 4 ++-- cmd/dendrite/main.go | 4 ++-- cmd/generate-keys/main.go | 4 ++-- contrib/dendrite-demo-i2p/main.go | 4 ++-- contrib/dendrite-demo-i2p/main_i2p.go | 4 ++-- contrib/dendrite-demo-tor/main.go | 4 ++-- contrib/dendrite-demo-tor/main_tor.go | 4 ++-- federationapi/consumers/keychange.go | 4 ++-- federationapi/consumers/presence.go | 4 ++-- federationapi/consumers/receipts.go | 4 ++-- federationapi/consumers/roomserver.go | 4 ++-- federationapi/consumers/roomserver_test.go | 4 ++-- federationapi/consumers/sendtodevice.go | 4 ++-- federationapi/consumers/typing.go | 4 ++-- federationapi/federationapi.go | 4 ++-- federationapi/internal/federationclient_test.go | 4 ++-- federationapi/internal/perform_test.go | 4 ++-- federationapi/producers/syncapi.go | 4 ++-- federationapi/queue/destinationqueue.go | 4 ++-- federationapi/queue/queue.go | 4 ++-- federationapi/queue/queue_test.go | 4 ++-- federationapi/routing/backfill.go | 4 ++-- federationapi/routing/devices.go | 4 ++-- federationapi/routing/eventauth.go | 4 ++-- federationapi/routing/events.go | 4 ++-- federationapi/routing/invite.go | 4 ++-- federationapi/routing/join.go | 4 ++-- federationapi/routing/keys.go | 4 ++-- federationapi/routing/leave.go | 4 ++-- federationapi/routing/missingevents.go | 4 ++-- federationapi/routing/openid.go | 4 ++-- federationapi/routing/peek.go | 4 ++-- federationapi/routing/profile.go | 4 ++-- federationapi/routing/profile_test.go | 4 ++-- federationapi/routing/query.go | 4 ++-- federationapi/routing/query_test.go | 4 ++-- federationapi/routing/routing.go | 4 ++-- federationapi/routing/send.go | 4 ++-- federationapi/routing/send_test.go | 4 ++-- federationapi/routing/state.go | 4 ++-- federationapi/routing/threepid.go | 4 ++-- federationapi/routing/version.go | 4 ++-- federationapi/storage/interface.go | 4 ++-- federationapi/storage/postgres/assumed_offline_table.go | 4 ++-- federationapi/storage/postgres/blacklist_table.go | 4 ++-- .../storage/postgres/deltas/2021020411080000_rooms.go | 4 ++-- .../storage/postgres/deltas/2022042812473400_addexpiresat.go | 4 ++-- federationapi/storage/postgres/inbound_peeks_table.go | 4 ++-- federationapi/storage/postgres/joined_hosts_table.go | 4 ++-- .../storage/postgres/notary_server_keys_json_table.go | 4 ++-- .../storage/postgres/notary_server_keys_metadata_table.go | 4 ++-- federationapi/storage/postgres/outbound_peeks_table.go | 4 ++-- federationapi/storage/postgres/queue_edus_table.go | 4 ++-- federationapi/storage/postgres/queue_json_table.go | 4 ++-- federationapi/storage/postgres/queue_pdus_table.go | 4 ++-- federationapi/storage/postgres/relay_servers_table.go | 4 ++-- federationapi/storage/postgres/server_key_table.go | 4 ++-- federationapi/storage/postgres/storage.go | 4 ++-- federationapi/storage/shared/receipt/receipt.go | 4 ++-- federationapi/storage/shared/storage.go | 4 ++-- federationapi/storage/shared/storage_edus.go | 4 ++-- federationapi/storage/shared/storage_keys.go | 4 ++-- federationapi/storage/shared/storage_pdus.go | 4 ++-- federationapi/storage/sqlite3/assumed_offline_table.go | 4 ++-- federationapi/storage/sqlite3/blacklist_table.go | 4 ++-- .../storage/sqlite3/deltas/2021020411080000_rooms.go | 4 ++-- .../storage/sqlite3/deltas/2022042812473400_addexpiresat.go | 4 ++-- federationapi/storage/sqlite3/inbound_peeks_table.go | 4 ++-- federationapi/storage/sqlite3/joined_hosts_table.go | 4 ++-- .../storage/sqlite3/notary_server_keys_json_table.go | 4 ++-- .../storage/sqlite3/notary_server_keys_metadata_table.go | 4 ++-- federationapi/storage/sqlite3/outbound_peeks_table.go | 4 ++-- federationapi/storage/sqlite3/queue_edus_table.go | 4 ++-- federationapi/storage/sqlite3/queue_json_table.go | 4 ++-- federationapi/storage/sqlite3/queue_pdus_table.go | 4 ++-- federationapi/storage/sqlite3/relay_servers_table.go | 4 ++-- federationapi/storage/sqlite3/server_key_table.go | 4 ++-- federationapi/storage/sqlite3/storage.go | 4 ++-- federationapi/storage/storage.go | 4 ++-- federationapi/storage/storage_wasm.go | 4 ++-- federationapi/storage/tables/interface.go | 4 ++-- federationapi/types/types.go | 4 ++-- internal/caching/cache_typing.go | 4 ++-- internal/caching/cache_typing_test.go | 4 ++-- internal/caching/caches.go | 4 ++-- internal/caching/impl_ristretto.go | 4 ++-- internal/eventutil/eventcontent.go | 4 ++-- internal/eventutil/events.go | 4 ++-- internal/eventutil/types.go | 4 ++-- internal/fulltext/bleve.go | 4 ++-- internal/fulltext/bleve_test.go | 4 ++-- internal/fulltext/bleve_wasm.go | 4 ++-- internal/hooks/hooks.go | 4 ++-- internal/httputil/httpapi.go | 4 ++-- internal/httputil/httpapi_test.go | 4 ++-- internal/httputil/paths.go | 4 ++-- internal/httputil/routing.go | 4 ++-- internal/log.go | 4 ++-- internal/log_unix.go | 4 ++-- internal/log_windows.go | 4 ++-- internal/sqlutil/connection_manager.go | 4 ++-- internal/sqlutil/migrate.go | 4 ++-- internal/sqlutil/sql.go | 4 ++-- internal/sqlutil/unique_constraint.go | 4 ++-- internal/sqlutil/unique_constraint_cgo.go | 4 ++-- internal/sqlutil/unique_constraint_wasm.go | 4 ++-- internal/sqlutil/uri.go | 4 ++-- internal/tracing.go | 4 ++-- internal/transactionrequest.go | 4 ++-- internal/transactionrequest_test.go | 4 ++-- internal/transactions/transactions.go | 4 ++-- internal/transactions/transactions_test.go | 4 ++-- internal/validate.go | 4 ++-- mediaapi/fileutils/fileutils.go | 4 ++-- mediaapi/mediaapi.go | 4 ++-- mediaapi/routing/download.go | 4 ++-- mediaapi/routing/routing.go | 4 ++-- mediaapi/routing/upload.go | 4 ++-- mediaapi/storage/interface.go | 4 ++-- mediaapi/storage/postgres/media_repository_table.go | 4 ++-- mediaapi/storage/postgres/mediaapi.go | 4 ++-- mediaapi/storage/postgres/thumbnail_table.go | 4 ++-- mediaapi/storage/shared/mediaapi.go | 4 ++-- mediaapi/storage/sqlite3/media_repository_table.go | 4 ++-- mediaapi/storage/sqlite3/mediaapi.go | 4 ++-- mediaapi/storage/sqlite3/thumbnail_table.go | 4 ++-- mediaapi/storage/storage.go | 4 ++-- mediaapi/storage/storage_wasm.go | 4 ++-- mediaapi/storage/tables/interface.go | 4 ++-- mediaapi/thumbnailer/thumbnailer.go | 4 ++-- mediaapi/thumbnailer/thumbnailer_bimg.go | 4 ++-- mediaapi/thumbnailer/thumbnailer_nfnt.go | 4 ++-- mediaapi/types/types.go | 4 ++-- relayapi/api/api.go | 4 ++-- relayapi/internal/api.go | 4 ++-- relayapi/internal/perform.go | 4 ++-- relayapi/internal/perform_test.go | 4 ++-- relayapi/relayapi.go | 4 ++-- relayapi/relayapi_test.go | 4 ++-- relayapi/routing/relaytxn.go | 4 ++-- relayapi/routing/relaytxn_test.go | 4 ++-- relayapi/routing/routing.go | 4 ++-- relayapi/routing/sendrelay.go | 4 ++-- relayapi/routing/sendrelay_test.go | 4 ++-- relayapi/storage/interface.go | 4 ++-- relayapi/storage/postgres/relay_queue_json_table.go | 4 ++-- relayapi/storage/postgres/relay_queue_table.go | 4 ++-- relayapi/storage/postgres/storage.go | 4 ++-- relayapi/storage/shared/storage.go | 4 ++-- relayapi/storage/sqlite3/relay_queue_json_table.go | 4 ++-- relayapi/storage/sqlite3/relay_queue_table.go | 4 ++-- relayapi/storage/sqlite3/storage.go | 4 ++-- relayapi/storage/storage.go | 4 ++-- relayapi/storage/storage_wasm.go | 4 ++-- relayapi/storage/tables/interface.go | 4 ++-- relayapi/storage/tables/relay_queue_json_table_test.go | 4 ++-- relayapi/storage/tables/relay_queue_table_test.go | 4 ++-- roomserver/acls/acls.go | 4 ++-- roomserver/acls/acls_test.go | 4 ++-- roomserver/api/alias.go | 4 ++-- roomserver/api/input.go | 4 ++-- roomserver/api/output.go | 4 ++-- roomserver/api/query.go | 4 ++-- roomserver/api/wrapper.go | 4 ++-- roomserver/auth/auth.go | 4 ++-- roomserver/internal/alias.go | 4 ++-- roomserver/internal/helpers/auth.go | 4 ++-- roomserver/internal/helpers/auth_test.go | 4 ++-- roomserver/internal/input/input.go | 4 ++-- roomserver/internal/input/input_events.go | 4 ++-- roomserver/internal/input/input_latest_events.go | 4 ++-- roomserver/internal/input/input_membership.go | 4 ++-- roomserver/internal/perform/perform_admin.go | 4 ++-- roomserver/internal/perform/perform_backfill.go | 4 ++-- roomserver/internal/perform/perform_create_room.go | 4 ++-- roomserver/internal/perform/perform_forget.go | 4 ++-- roomserver/internal/perform/perform_inbound_peek.go | 4 ++-- roomserver/internal/perform/perform_invite.go | 4 ++-- roomserver/internal/perform/perform_join.go | 4 ++-- roomserver/internal/perform/perform_leave.go | 4 ++-- roomserver/internal/perform/perform_peek.go | 4 ++-- roomserver/internal/perform/perform_publish.go | 4 ++-- roomserver/internal/perform/perform_unpeek.go | 4 ++-- roomserver/internal/perform/perform_upgrade.go | 4 ++-- roomserver/internal/query/query.go | 4 ++-- roomserver/internal/query/query_room_hierarchy.go | 4 ++-- roomserver/internal/query/query_test.go | 4 ++-- roomserver/producers/roomevent.go | 4 ++-- roomserver/roomserver.go | 4 ++-- roomserver/state/state.go | 4 ++-- roomserver/state/state_test.go | 4 ++-- roomserver/storage/interface.go | 4 ++-- .../postgres/deltas/20201028212440_add_forgotten_column.go | 4 ++-- .../postgres/deltas/2021041615092700_state_blocks_refactor.go | 4 ++-- .../postgres/deltas/20221027084407_published_appservice.go | 4 ++-- .../deltas/20230131091021_published_appservice_pkey.go | 4 ++-- .../postgres/deltas/20230516154000_drop_reference_sha.go | 4 ++-- roomserver/storage/postgres/event_json_table.go | 4 ++-- roomserver/storage/postgres/event_state_keys_table.go | 4 ++-- roomserver/storage/postgres/event_types_table.go | 4 ++-- roomserver/storage/postgres/events_table.go | 4 ++-- roomserver/storage/postgres/invite_table.go | 4 ++-- roomserver/storage/postgres/membership_table.go | 4 ++-- roomserver/storage/postgres/previous_events_table.go | 4 ++-- roomserver/storage/postgres/published_table.go | 4 ++-- roomserver/storage/postgres/purge_statements.go | 4 ++-- roomserver/storage/postgres/redactions_table.go | 4 ++-- roomserver/storage/postgres/reported_events_table.go | 4 ++-- roomserver/storage/postgres/room_aliases_table.go | 4 ++-- roomserver/storage/postgres/rooms_table.go | 4 ++-- roomserver/storage/postgres/state_block_table.go | 4 ++-- roomserver/storage/postgres/state_snapshot_table.go | 4 ++-- roomserver/storage/postgres/storage.go | 4 ++-- roomserver/storage/postgres/user_room_keys_table.go | 4 ++-- roomserver/storage/shared/prepare.go | 4 ++-- .../sqlite3/deltas/20201028212440_add_forgotten_column.go | 4 ++-- .../sqlite3/deltas/2021041615092700_state_blocks_refactor.go | 4 ++-- .../sqlite3/deltas/20221027084407_published_appservice.go | 4 ++-- .../sqlite3/deltas/20230516154000_drop_reference_sha.go | 4 ++-- roomserver/storage/sqlite3/event_json_table.go | 4 ++-- roomserver/storage/sqlite3/event_state_keys_table.go | 4 ++-- roomserver/storage/sqlite3/event_types_table.go | 4 ++-- roomserver/storage/sqlite3/events_table.go | 4 ++-- roomserver/storage/sqlite3/invite_table.go | 4 ++-- roomserver/storage/sqlite3/membership_table.go | 4 ++-- roomserver/storage/sqlite3/previous_events_table.go | 4 ++-- roomserver/storage/sqlite3/published_table.go | 4 ++-- roomserver/storage/sqlite3/purge_statements.go | 4 ++-- roomserver/storage/sqlite3/redactions_table.go | 4 ++-- roomserver/storage/sqlite3/reported_events_table.go | 4 ++-- roomserver/storage/sqlite3/room_aliases_table.go | 4 ++-- roomserver/storage/sqlite3/rooms_table.go | 4 ++-- roomserver/storage/sqlite3/state_block_table.go | 4 ++-- roomserver/storage/sqlite3/state_snapshot_table.go | 4 ++-- roomserver/storage/sqlite3/storage.go | 4 ++-- roomserver/storage/sqlite3/user_room_keys_table.go | 4 ++-- roomserver/storage/storage.go | 4 ++-- roomserver/storage/storage_wasm.go | 4 ++-- roomserver/types/headered_event.go | 4 ++-- roomserver/types/types.go | 4 ++-- roomserver/version/version.go | 4 ++-- setup/base/base.go | 4 ++-- setup/config/config.go | 4 ++-- setup/config/config_appservice.go | 4 ++-- setup/config/config_relayapi.go | 4 ++-- setup/config/config_test.go | 4 ++-- setup/flags.go | 4 ++-- setup/monolith.go | 4 ++-- setup/mscs/msc2836/msc2836.go | 4 ++-- setup/mscs/mscs.go | 4 ++-- syncapi/consumers/clientapi.go | 4 ++-- syncapi/consumers/keychange.go | 4 ++-- syncapi/consumers/presence.go | 4 ++-- syncapi/consumers/receipts.go | 4 ++-- syncapi/consumers/roomserver.go | 4 ++-- syncapi/consumers/sendtodevice.go | 4 ++-- syncapi/consumers/typing.go | 4 ++-- syncapi/consumers/userapi.go | 4 ++-- syncapi/internal/history_visibility.go | 4 ++-- syncapi/internal/keychange.go | 4 ++-- syncapi/notifier/notifier.go | 4 ++-- syncapi/notifier/notifier_test.go | 4 ++-- syncapi/notifier/userstream.go | 4 ++-- syncapi/producers/appservices.go | 4 ++-- syncapi/producers/federationapi_presence.go | 4 ++-- syncapi/routing/context.go | 4 ++-- syncapi/routing/filter.go | 4 ++-- syncapi/routing/getevent.go | 4 ++-- syncapi/routing/memberships.go | 4 ++-- syncapi/routing/messages.go | 4 ++-- syncapi/routing/relations.go | 4 ++-- syncapi/routing/routing.go | 4 ++-- syncapi/routing/search.go | 4 ++-- syncapi/storage/interface.go | 4 ++-- syncapi/storage/postgres/account_data_table.go | 4 ++-- syncapi/storage/postgres/backwards_extremities_table.go | 4 ++-- syncapi/storage/postgres/current_room_state_table.go | 4 ++-- syncapi/storage/postgres/deltas/20201211125500_sequences.go | 4 ++-- .../postgres/deltas/20210112130000_sendtodevice_sentcolumn.go | 4 ++-- .../deltas/2022061412000000_history_visibility_column.go | 4 ++-- .../storage/postgres/deltas/20230201152200_rename_index.go | 4 ++-- syncapi/storage/postgres/filter_table.go | 4 ++-- syncapi/storage/postgres/filtering.go | 4 ++-- syncapi/storage/postgres/ignores_table.go | 4 ++-- syncapi/storage/postgres/invites_table.go | 4 ++-- syncapi/storage/postgres/memberships_table.go | 4 ++-- syncapi/storage/postgres/notification_data_table.go | 4 ++-- syncapi/storage/postgres/output_room_events_table.go | 4 ++-- syncapi/storage/postgres/output_room_events_topology_table.go | 4 ++-- syncapi/storage/postgres/peeks_table.go | 4 ++-- syncapi/storage/postgres/presence_table.go | 4 ++-- syncapi/storage/postgres/receipt_table.go | 4 ++-- syncapi/storage/postgres/relations_table.go | 4 ++-- syncapi/storage/postgres/send_to_device_table.go | 4 ++-- syncapi/storage/postgres/syncserver.go | 4 ++-- syncapi/storage/shared/storage_consumer.go | 4 ++-- syncapi/storage/sqlite3/account_data_table.go | 4 ++-- syncapi/storage/sqlite3/backwards_extremities_table.go | 4 ++-- syncapi/storage/sqlite3/current_room_state_table.go | 4 ++-- syncapi/storage/sqlite3/deltas/20201211125500_sequences.go | 4 ++-- .../sqlite3/deltas/20210112130000_sendtodevice_sentcolumn.go | 4 ++-- .../deltas/2022061412000000_history_visibility_column.go | 4 ++-- syncapi/storage/sqlite3/filter_table.go | 4 ++-- syncapi/storage/sqlite3/ignores_table.go | 4 ++-- syncapi/storage/sqlite3/invites_table.go | 4 ++-- syncapi/storage/sqlite3/memberships_table.go | 4 ++-- syncapi/storage/sqlite3/notification_data_table.go | 4 ++-- syncapi/storage/sqlite3/output_room_events_table.go | 4 ++-- syncapi/storage/sqlite3/output_room_events_topology_table.go | 4 ++-- syncapi/storage/sqlite3/peeks_table.go | 4 ++-- syncapi/storage/sqlite3/presence_table.go | 4 ++-- syncapi/storage/sqlite3/receipt_table.go | 4 ++-- syncapi/storage/sqlite3/relations_table.go | 4 ++-- syncapi/storage/sqlite3/send_to_device_table.go | 4 ++-- syncapi/storage/sqlite3/syncserver.go | 4 ++-- syncapi/storage/storage.go | 4 ++-- syncapi/storage/storage_wasm.go | 4 ++-- syncapi/storage/tables/interface.go | 4 ++-- syncapi/streams/stream_presence.go | 4 ++-- syncapi/sync/request.go | 4 ++-- syncapi/sync/requestpool.go | 4 ++-- syncapi/syncapi.go | 4 ++-- syncapi/synctypes/clientevent.go | 4 ++-- syncapi/synctypes/clientevent_test.go | 4 ++-- syncapi/synctypes/filter.go | 4 ++-- syncapi/types/presence.go | 4 ++-- syncapi/types/types.go | 4 ++-- test/db.go | 4 ++-- test/event.go | 4 ++-- test/keyring.go | 4 ++-- test/keys.go | 4 ++-- test/memory_federation_db.go | 4 ++-- test/memory_relay_db.go | 4 ++-- test/room.go | 4 ++-- test/slice.go | 4 ++-- test/testrig/base.go | 4 ++-- test/user.go | 4 ++-- test/wasm/index.js | 4 ++-- userapi/api/api.go | 4 ++-- userapi/api/api_logintoken.go | 4 ++-- userapi/consumers/clientapi.go | 4 ++-- userapi/consumers/devicelistupdate.go | 4 ++-- userapi/consumers/signingkeyupdate.go | 4 ++-- userapi/internal/api_logintoken.go | 4 ++-- userapi/internal/cross_signing.go | 4 ++-- userapi/internal/device_list_update.go | 4 ++-- userapi/internal/device_list_update_default.go | 4 ++-- userapi/internal/device_list_update_sytest.go | 4 ++-- userapi/internal/device_list_update_test.go | 4 ++-- userapi/internal/key_api.go | 4 ++-- userapi/internal/user_api.go | 4 ++-- userapi/producers/keychange.go | 4 ++-- userapi/storage/interface.go | 4 ++-- userapi/storage/postgres/account_data_table.go | 4 ++-- userapi/storage/postgres/accounts_table.go | 4 ++-- userapi/storage/postgres/cross_signing_keys_table.go | 4 ++-- userapi/storage/postgres/cross_signing_sigs_table.go | 4 ++-- .../storage/postgres/deltas/2022012016470000_key_changes.go | 4 ++-- .../storage/postgres/deltas/2022042612000000_xsigning_idx.go | 4 ++-- userapi/storage/postgres/device_keys_table.go | 4 ++-- userapi/storage/postgres/devices_table.go | 4 ++-- userapi/storage/postgres/key_backup_table.go | 4 ++-- userapi/storage/postgres/key_backup_version_table.go | 4 ++-- userapi/storage/postgres/key_changes_table.go | 4 ++-- userapi/storage/postgres/logintoken_table.go | 4 ++-- userapi/storage/postgres/notifications_table.go | 4 ++-- userapi/storage/postgres/one_time_keys_table.go | 4 ++-- userapi/storage/postgres/profile_table.go | 4 ++-- userapi/storage/postgres/pusher_table.go | 4 ++-- userapi/storage/postgres/stale_device_lists.go | 4 ++-- userapi/storage/postgres/stats_table.go | 4 ++-- userapi/storage/postgres/storage.go | 4 ++-- userapi/storage/postgres/threepid_table.go | 4 ++-- userapi/storage/shared/storage.go | 4 ++-- userapi/storage/sqlite3/account_data_table.go | 4 ++-- userapi/storage/sqlite3/accounts_table.go | 4 ++-- userapi/storage/sqlite3/constraint_wasm.go | 4 ++-- userapi/storage/sqlite3/cross_signing_keys_table.go | 4 ++-- userapi/storage/sqlite3/cross_signing_sigs_table.go | 4 ++-- .../storage/sqlite3/deltas/2022012016470000_key_changes.go | 4 ++-- .../storage/sqlite3/deltas/2022042612000000_xsigning_idx.go | 4 ++-- userapi/storage/sqlite3/device_keys_table.go | 4 ++-- userapi/storage/sqlite3/devices_table.go | 4 ++-- userapi/storage/sqlite3/key_backup_table.go | 4 ++-- userapi/storage/sqlite3/key_backup_version_table.go | 4 ++-- userapi/storage/sqlite3/key_changes_table.go | 4 ++-- userapi/storage/sqlite3/logintoken_table.go | 4 ++-- userapi/storage/sqlite3/notifications_table.go | 4 ++-- userapi/storage/sqlite3/one_time_keys_table.go | 4 ++-- userapi/storage/sqlite3/profile_table.go | 4 ++-- userapi/storage/sqlite3/pusher_table.go | 4 ++-- userapi/storage/sqlite3/stale_device_lists.go | 4 ++-- userapi/storage/sqlite3/stats_table.go | 4 ++-- userapi/storage/sqlite3/storage.go | 4 ++-- userapi/storage/sqlite3/threepid_table.go | 4 ++-- userapi/storage/storage.go | 4 ++-- userapi/storage/storage_wasm.go | 4 ++-- userapi/storage/tables/interface.go | 4 ++-- userapi/types/statistics.go | 4 ++-- userapi/types/storage.go | 4 ++-- userapi/userapi.go | 4 ++-- userapi/userapi_test.go | 4 ++-- userapi/util/phonehomestats.go | 4 ++-- userapi/util/stats.go | 4 ++-- userapi/util/stats_wasm.go | 4 ++-- userapi/util/stats_windows.go | 4 ++-- 501 files changed, 1001 insertions(+), 1001 deletions(-) diff --git a/Dockerfile b/Dockerfile index 15ec7edae..27e7b39ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN apk --update --no-cache add curl LABEL org.opencontainers.image.title="Dendrite" LABEL org.opencontainers.image.description="Next-generation Matrix homeserver written in Go" LABEL org.opencontainers.image.source="https://github.com/element-hq/dendrite" -LABEL org.opencontainers.image.licenses="AGPL-3.0-only" +LABEL org.opencontainers.image.licenses="AGPL-3.0-only OR LicenseRef-Element-Commercial" LABEL org.opencontainers.image.documentation="https://element-hq.github.io/dendrite/" LABEL org.opencontainers.image.vendor="New Vector Ltd." diff --git a/appservice/api/query.go b/appservice/api/query.go index 3b942e9f4..f148f4e6f 100644 --- a/appservice/api/query.go +++ b/appservice/api/query.go @@ -1,7 +1,7 @@ // Copyright 2018-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. // Package api contains methods used by dendrite components in multi-process // mode to send requests to the appservice component, typically in order to ask diff --git a/appservice/appservice.go b/appservice/appservice.go index 4d3186e53..99eefd53a 100644 --- a/appservice/appservice.go +++ b/appservice/appservice.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2018 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package appservice diff --git a/appservice/consumers/roomserver.go b/appservice/consumers/roomserver.go index 698382d0e..862dde49c 100644 --- a/appservice/consumers/roomserver.go +++ b/appservice/consumers/roomserver.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2018 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/appservice/query/query.go b/appservice/query/query.go index 01c1ce73c..1bf688e8e 100644 --- a/appservice/query/query.go +++ b/appservice/query/query.go @@ -1,7 +1,7 @@ // Copyright 2018-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. // Package query handles requests from other internal dendrite components when // they interact with the AppServiceQueryAPI. diff --git a/build/dendritejs-pinecone/jsServer.go b/build/dendritejs-pinecone/jsServer.go index 589f84a31..57e1f610e 100644 --- a/build/dendritejs-pinecone/jsServer.go +++ b/build/dendritejs-pinecone/jsServer.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build wasm // +build wasm diff --git a/build/dendritejs-pinecone/main.go b/build/dendritejs-pinecone/main.go index 250595520..4f6235c54 100644 --- a/build/dendritejs-pinecone/main.go +++ b/build/dendritejs-pinecone/main.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build wasm // +build wasm diff --git a/build/dendritejs-pinecone/main_noop.go b/build/dendritejs-pinecone/main_noop.go index 3b70bbbce..48b92fe03 100644 --- a/build/dendritejs-pinecone/main_noop.go +++ b/build/dendritejs-pinecone/main_noop.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !wasm // +build !wasm diff --git a/build/dendritejs-pinecone/main_test.go b/build/dendritejs-pinecone/main_test.go index a0270c37c..7e7bb1dd5 100644 --- a/build/dendritejs-pinecone/main_test.go +++ b/build/dendritejs-pinecone/main_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build wasm // +build wasm diff --git a/build/gobind-pinecone/monolith.go b/build/gobind-pinecone/monolith.go index 1f53fba89..4cde4783e 100644 --- a/build/gobind-pinecone/monolith.go +++ b/build/gobind-pinecone/monolith.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package gobind diff --git a/build/gobind-pinecone/monolith_test.go b/build/gobind-pinecone/monolith_test.go index 4bfeb7ac6..99446d300 100644 --- a/build/gobind-pinecone/monolith_test.go +++ b/build/gobind-pinecone/monolith_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package gobind diff --git a/build/gobind-pinecone/platform_ios.go b/build/gobind-pinecone/platform_ios.go index c54a872e5..88bde39f5 100644 --- a/build/gobind-pinecone/platform_ios.go +++ b/build/gobind-pinecone/platform_ios.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build ios // +build ios diff --git a/build/gobind-pinecone/platform_other.go b/build/gobind-pinecone/platform_other.go index 1cfd0d894..23e4108ca 100644 --- a/build/gobind-pinecone/platform_other.go +++ b/build/gobind-pinecone/platform_other.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !ios // +build !ios diff --git a/clientapi/api/api.go b/clientapi/api/api.go index ccda80e95..5e3247f14 100644 --- a/clientapi/api/api.go +++ b/clientapi/api/api.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package api diff --git a/clientapi/auth/auth.go b/clientapi/auth/auth.go index c1225a91c..c32ed0fae 100644 --- a/clientapi/auth/auth.go +++ b/clientapi/auth/auth.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. // Package auth implements authentication checks and storage. package auth diff --git a/clientapi/auth/authtypes/flow.go b/clientapi/auth/authtypes/flow.go index 3dc1bba6c..0f5d536ab 100644 --- a/clientapi/auth/authtypes/flow.go +++ b/clientapi/auth/authtypes/flow.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Andrew Morgan // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package authtypes diff --git a/clientapi/auth/authtypes/membership.go b/clientapi/auth/authtypes/membership.go index 7ce12250c..cf21453ec 100644 --- a/clientapi/auth/authtypes/membership.go +++ b/clientapi/auth/authtypes/membership.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package authtypes diff --git a/clientapi/auth/authtypes/profile.go b/clientapi/auth/authtypes/profile.go index 007097197..9d162fb26 100644 --- a/clientapi/auth/authtypes/profile.go +++ b/clientapi/auth/authtypes/profile.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package authtypes diff --git a/clientapi/auth/authtypes/threepid.go b/clientapi/auth/authtypes/threepid.go index ff41c0258..1d7653d68 100644 --- a/clientapi/auth/authtypes/threepid.go +++ b/clientapi/auth/authtypes/threepid.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package authtypes diff --git a/clientapi/auth/login.go b/clientapi/auth/login.go index 051668f2f..3502cdece 100644 --- a/clientapi/auth/login.go +++ b/clientapi/auth/login.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package auth diff --git a/clientapi/auth/login_application_service.go b/clientapi/auth/login_application_service.go index 28291dcb3..974242417 100644 --- a/clientapi/auth/login_application_service.go +++ b/clientapi/auth/login_application_service.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package auth diff --git a/clientapi/auth/login_test.go b/clientapi/auth/login_test.go index f304a09e3..617348f73 100644 --- a/clientapi/auth/login_test.go +++ b/clientapi/auth/login_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package auth diff --git a/clientapi/auth/login_token.go b/clientapi/auth/login_token.go index 7b2e79c4c..c46680a49 100644 --- a/clientapi/auth/login_token.go +++ b/clientapi/auth/login_token.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package auth diff --git a/clientapi/auth/password.go b/clientapi/auth/password.go index b7960a50d..aab948212 100644 --- a/clientapi/auth/password.go +++ b/clientapi/auth/password.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package auth diff --git a/clientapi/auth/user_interactive.go b/clientapi/auth/user_interactive.go index 44d213b7d..cc5fbfbed 100644 --- a/clientapi/auth/user_interactive.go +++ b/clientapi/auth/user_interactive.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package auth diff --git a/clientapi/clientapi.go b/clientapi/clientapi.go index 54c53d402..dbf862ca6 100644 --- a/clientapi/clientapi.go +++ b/clientapi/clientapi.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package clientapi diff --git a/clientapi/httputil/httputil.go b/clientapi/httputil/httputil.go index 7ec931e8d..8e22bbcb6 100644 --- a/clientapi/httputil/httputil.go +++ b/clientapi/httputil/httputil.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package httputil diff --git a/clientapi/httputil/parse.go b/clientapi/httputil/parse.go index 4eb7fb054..8ceadcf06 100644 --- a/clientapi/httputil/parse.go +++ b/clientapi/httputil/parse.go @@ -1,7 +1,7 @@ // Copyright 2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package httputil diff --git a/clientapi/producers/syncapi.go b/clientapi/producers/syncapi.go index 9451e5b22..330a1685f 100644 --- a/clientapi/producers/syncapi.go +++ b/clientapi/producers/syncapi.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package producers diff --git a/clientapi/routing/account_data.go b/clientapi/routing/account_data.go index d222187a5..4fc19134a 100644 --- a/clientapi/routing/account_data.go +++ b/clientapi/routing/account_data.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/admin_whois.go b/clientapi/routing/admin_whois.go index 20e0f5d72..cd1a8d2f1 100644 --- a/clientapi/routing/admin_whois.go +++ b/clientapi/routing/admin_whois.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 David Spenler // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/aliases.go b/clientapi/routing/aliases.go index 808bb5598..448df8a63 100644 --- a/clientapi/routing/aliases.go +++ b/clientapi/routing/aliases.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/auth_fallback.go b/clientapi/routing/auth_fallback.go index e43a3d85f..713b0bab5 100644 --- a/clientapi/routing/auth_fallback.go +++ b/clientapi/routing/auth_fallback.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2019 Parminder Singh // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/capabilities.go b/clientapi/routing/capabilities.go index aef41d317..157d2bd22 100644 --- a/clientapi/routing/capabilities.go +++ b/clientapi/routing/capabilities.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/createroom.go b/clientapi/routing/createroom.go index a1d3c3831..dfc151730 100644 --- a/clientapi/routing/createroom.go +++ b/clientapi/routing/createroom.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/device.go b/clientapi/routing/device.go index 6383b621d..9b059469c 100644 --- a/clientapi/routing/device.go +++ b/clientapi/routing/device.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Paul Tötterman // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/directory.go b/clientapi/routing/directory.go index 27bd8e9f6..ef8e3075c 100644 --- a/clientapi/routing/directory.go +++ b/clientapi/routing/directory.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/directory_public.go b/clientapi/routing/directory_public.go index e6ec2642e..9a30b85bd 100644 --- a/clientapi/routing/directory_public.go +++ b/clientapi/routing/directory_public.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/joined_rooms.go b/clientapi/routing/joined_rooms.go index 030766d37..88b65089d 100644 --- a/clientapi/routing/joined_rooms.go +++ b/clientapi/routing/joined_rooms.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/joinroom.go b/clientapi/routing/joinroom.go index ffa05b654..30cb3233c 100644 --- a/clientapi/routing/joinroom.go +++ b/clientapi/routing/joinroom.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/key_backup.go b/clientapi/routing/key_backup.go index c2460d4ae..69619cfff 100644 --- a/clientapi/routing/key_backup.go +++ b/clientapi/routing/key_backup.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/key_crosssigning.go b/clientapi/routing/key_crosssigning.go index 69d8a3d9d..e6f093b5e 100644 --- a/clientapi/routing/key_crosssigning.go +++ b/clientapi/routing/key_crosssigning.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/keys.go b/clientapi/routing/keys.go index 11e901ded..0a8b4e68e 100644 --- a/clientapi/routing/keys.go +++ b/clientapi/routing/keys.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/leaveroom.go b/clientapi/routing/leaveroom.go index b39814ba9..753e73223 100644 --- a/clientapi/routing/leaveroom.go +++ b/clientapi/routing/leaveroom.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/login.go b/clientapi/routing/login.go index 8e4dfc5bd..442719a1d 100644 --- a/clientapi/routing/login.go +++ b/clientapi/routing/login.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/logout.go b/clientapi/routing/logout.go index a29d9d8f0..74f6b28dc 100644 --- a/clientapi/routing/logout.go +++ b/clientapi/routing/logout.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/membership.go b/clientapi/routing/membership.go index a46f6d6b9..c2b26d088 100644 --- a/clientapi/routing/membership.go +++ b/clientapi/routing/membership.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/memberships.go b/clientapi/routing/memberships.go index 90ca86e35..6c6e3d89b 100644 --- a/clientapi/routing/memberships.go +++ b/clientapi/routing/memberships.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2024 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/notification.go b/clientapi/routing/notification.go index 82b49920b..ebc8f8140 100644 --- a/clientapi/routing/notification.go +++ b/clientapi/routing/notification.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 Dan Peleg // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/openid.go b/clientapi/routing/openid.go index 774cf0a82..4ff40b43f 100644 --- a/clientapi/routing/openid.go +++ b/clientapi/routing/openid.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/peekroom.go b/clientapi/routing/peekroom.go index 71232b358..9b6699b09 100644 --- a/clientapi/routing/peekroom.go +++ b/clientapi/routing/peekroom.go @@ -1,7 +1,7 @@ // Copyright 2020-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/presence.go b/clientapi/routing/presence.go index bb2ae735a..55282c3f7 100644 --- a/clientapi/routing/presence.go +++ b/clientapi/routing/presence.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/profile.go b/clientapi/routing/profile.go index ab7708667..b75d38a62 100644 --- a/clientapi/routing/profile.go +++ b/clientapi/routing/profile.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/pusher.go b/clientapi/routing/pusher.go index ea1b5f60b..39646393f 100644 --- a/clientapi/routing/pusher.go +++ b/clientapi/routing/pusher.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 Dan Peleg // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/receipt.go b/clientapi/routing/receipt.go index d03f43e7d..403949eb4 100644 --- a/clientapi/routing/receipt.go +++ b/clientapi/routing/receipt.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/redaction.go b/clientapi/routing/redaction.go index c354ef371..795b311b0 100644 --- a/clientapi/routing/redaction.go +++ b/clientapi/routing/redaction.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/register.go b/clientapi/routing/register.go index 63e310f70..5544dccd3 100644 --- a/clientapi/routing/register.go +++ b/clientapi/routing/register.go @@ -2,8 +2,8 @@ // Copyright 2017 Vector Creations Ltd // Copyright 2017 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/register_test.go b/clientapi/routing/register_test.go index 2d793049d..71cc0ca67 100644 --- a/clientapi/routing/register_test.go +++ b/clientapi/routing/register_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Andrew Morgan // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/report_event.go b/clientapi/routing/report_event.go index 3e48edbb2..dbeb345f0 100644 --- a/clientapi/routing/report_event.go +++ b/clientapi/routing/report_event.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/room_hierarchy.go b/clientapi/routing/room_hierarchy.go index 2eef53471..c8f335500 100644 --- a/clientapi/routing/room_hierarchy.go +++ b/clientapi/routing/room_hierarchy.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/room_tagging.go b/clientapi/routing/room_tagging.go index 110f86d18..191cf1331 100644 --- a/clientapi/routing/room_tagging.go +++ b/clientapi/routing/room_tagging.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2019 Sumukha PK // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/routing.go b/clientapi/routing/routing.go index f4a641b99..d72638ee0 100644 --- a/clientapi/routing/routing.go +++ b/clientapi/routing/routing.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/sendevent.go b/clientapi/routing/sendevent.go index 00c6c0368..a1a0300d2 100644 --- a/clientapi/routing/sendevent.go +++ b/clientapi/routing/sendevent.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/sendtodevice.go b/clientapi/routing/sendtodevice.go index 8ff7b75c8..9068625f9 100644 --- a/clientapi/routing/sendtodevice.go +++ b/clientapi/routing/sendtodevice.go @@ -1,7 +1,7 @@ // Copyright 2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/sendtyping.go b/clientapi/routing/sendtyping.go index 4f26f805c..5aa5c9697 100644 --- a/clientapi/routing/sendtyping.go +++ b/clientapi/routing/sendtyping.go @@ -1,7 +1,7 @@ // Copyright 2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/server_notices.go b/clientapi/routing/server_notices.go index 91e64c95b..846158678 100644 --- a/clientapi/routing/server_notices.go +++ b/clientapi/routing/server_notices.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/state.go b/clientapi/routing/state.go index 21fa08477..d702fd3bb 100644 --- a/clientapi/routing/state.go +++ b/clientapi/routing/state.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/thirdparty.go b/clientapi/routing/thirdparty.go index 20ce20568..83d491d93 100644 --- a/clientapi/routing/thirdparty.go +++ b/clientapi/routing/thirdparty.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/threepid.go b/clientapi/routing/threepid.go index 2f429752a..2fee21b9b 100644 --- a/clientapi/routing/threepid.go +++ b/clientapi/routing/threepid.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/upgrade_room.go b/clientapi/routing/upgrade_room.go index 51d611a9c..d71cdeaf4 100644 --- a/clientapi/routing/upgrade_room.go +++ b/clientapi/routing/upgrade_room.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/userdirectory.go b/clientapi/routing/userdirectory.go index f7d56820e..c46fc5a2a 100644 --- a/clientapi/routing/userdirectory.go +++ b/clientapi/routing/userdirectory.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/voip.go b/clientapi/routing/voip.go index c603d2649..24f68029a 100644 --- a/clientapi/routing/voip.go +++ b/clientapi/routing/voip.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Michael Telatysnki <7t3chguy@gmail.com> // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/routing/whoami.go b/clientapi/routing/whoami.go index 57e702b63..2b0bf52ac 100644 --- a/clientapi/routing/whoami.go +++ b/clientapi/routing/whoami.go @@ -1,7 +1,7 @@ // Copyright 2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/clientapi/threepid/invites.go b/clientapi/threepid/invites.go index 6d875eef7..f32b7848c 100644 --- a/clientapi/threepid/invites.go +++ b/clientapi/threepid/invites.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package threepid diff --git a/clientapi/threepid/threepid.go b/clientapi/threepid/threepid.go index 16ee9370d..3cf69c342 100644 --- a/clientapi/threepid/threepid.go +++ b/clientapi/threepid/threepid.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package threepid diff --git a/clientapi/userutil/userutil.go b/clientapi/userutil/userutil.go index d931cd431..c4a01383d 100644 --- a/clientapi/userutil/userutil.go +++ b/clientapi/userutil/userutil.go @@ -1,7 +1,7 @@ // Copyright 2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package userutil diff --git a/clientapi/userutil/userutil_test.go b/clientapi/userutil/userutil_test.go index 757c9c1f7..f6c34e5e6 100644 --- a/clientapi/userutil/userutil_test.go +++ b/clientapi/userutil/userutil_test.go @@ -1,7 +1,7 @@ // Copyright 2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package userutil diff --git a/cmd/create-account/main.go b/cmd/create-account/main.go index 4d9dcddf2..9e88f7d88 100644 --- a/cmd/create-account/main.go +++ b/cmd/create-account/main.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package main diff --git a/cmd/dendrite-demo-pinecone/conduit/conduit.go b/cmd/dendrite-demo-pinecone/conduit/conduit.go index 2d291e240..b747e051e 100644 --- a/cmd/dendrite-demo-pinecone/conduit/conduit.go +++ b/cmd/dendrite-demo-pinecone/conduit/conduit.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package conduit diff --git a/cmd/dendrite-demo-pinecone/conduit/conduit_test.go b/cmd/dendrite-demo-pinecone/conduit/conduit_test.go index 4322eb3d1..25c9c2795 100644 --- a/cmd/dendrite-demo-pinecone/conduit/conduit_test.go +++ b/cmd/dendrite-demo-pinecone/conduit/conduit_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package conduit diff --git a/cmd/dendrite-demo-pinecone/conn/client.go b/cmd/dendrite-demo-pinecone/conn/client.go index 298e5881e..8b21e5a84 100644 --- a/cmd/dendrite-demo-pinecone/conn/client.go +++ b/cmd/dendrite-demo-pinecone/conn/client.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package conn diff --git a/cmd/dendrite-demo-pinecone/conn/ws.go b/cmd/dendrite-demo-pinecone/conn/ws.go index d7ecd0d1b..6330b0b39 100644 --- a/cmd/dendrite-demo-pinecone/conn/ws.go +++ b/cmd/dendrite-demo-pinecone/conn/ws.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package conn diff --git a/cmd/dendrite-demo-pinecone/defaults/defaults.go b/cmd/dendrite-demo-pinecone/defaults/defaults.go index d6341446f..7fc463739 100644 --- a/cmd/dendrite-demo-pinecone/defaults/defaults.go +++ b/cmd/dendrite-demo-pinecone/defaults/defaults.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package defaults diff --git a/cmd/dendrite-demo-pinecone/embed/embed_elementweb.go b/cmd/dendrite-demo-pinecone/embed/embed_elementweb.go index 7ebfb6f88..ea2fe0347 100644 --- a/cmd/dendrite-demo-pinecone/embed/embed_elementweb.go +++ b/cmd/dendrite-demo-pinecone/embed/embed_elementweb.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build elementweb // +build elementweb diff --git a/cmd/dendrite-demo-pinecone/embed/embed_other.go b/cmd/dendrite-demo-pinecone/embed/embed_other.go index 87851c8d4..f43d6ae7c 100644 --- a/cmd/dendrite-demo-pinecone/embed/embed_other.go +++ b/cmd/dendrite-demo-pinecone/embed/embed_other.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !elementweb // +build !elementweb diff --git a/cmd/dendrite-demo-pinecone/main.go b/cmd/dendrite-demo-pinecone/main.go index e31d17e42..b05b63c81 100644 --- a/cmd/dendrite-demo-pinecone/main.go +++ b/cmd/dendrite-demo-pinecone/main.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package main diff --git a/cmd/dendrite-demo-pinecone/monolith/keys.go b/cmd/dendrite-demo-pinecone/monolith/keys.go index ddd439ef9..de9e41538 100644 --- a/cmd/dendrite-demo-pinecone/monolith/keys.go +++ b/cmd/dendrite-demo-pinecone/monolith/keys.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package monolith diff --git a/cmd/dendrite-demo-pinecone/monolith/monolith.go b/cmd/dendrite-demo-pinecone/monolith/monolith.go index 26f2eab2a..d8b5f1c84 100644 --- a/cmd/dendrite-demo-pinecone/monolith/monolith.go +++ b/cmd/dendrite-demo-pinecone/monolith/monolith.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package monolith diff --git a/cmd/dendrite-demo-pinecone/relay/retriever.go b/cmd/dendrite-demo-pinecone/relay/retriever.go index 49d95a68b..d126aef6a 100644 --- a/cmd/dendrite-demo-pinecone/relay/retriever.go +++ b/cmd/dendrite-demo-pinecone/relay/retriever.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package relay diff --git a/cmd/dendrite-demo-pinecone/relay/retriever_test.go b/cmd/dendrite-demo-pinecone/relay/retriever_test.go index 27d450386..cc60ef888 100644 --- a/cmd/dendrite-demo-pinecone/relay/retriever_test.go +++ b/cmd/dendrite-demo-pinecone/relay/retriever_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package relay diff --git a/cmd/dendrite-demo-pinecone/rooms/rooms.go b/cmd/dendrite-demo-pinecone/rooms/rooms.go index c594b5ae2..7a18c2ea1 100644 --- a/cmd/dendrite-demo-pinecone/rooms/rooms.go +++ b/cmd/dendrite-demo-pinecone/rooms/rooms.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package rooms diff --git a/cmd/dendrite-demo-pinecone/users/users.go b/cmd/dendrite-demo-pinecone/users/users.go index af62bfe53..9a7d40e59 100644 --- a/cmd/dendrite-demo-pinecone/users/users.go +++ b/cmd/dendrite-demo-pinecone/users/users.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package users diff --git a/cmd/dendrite-demo-yggdrasil/main.go b/cmd/dendrite-demo-yggdrasil/main.go index 617fdf071..8a0e3ee19 100644 --- a/cmd/dendrite-demo-yggdrasil/main.go +++ b/cmd/dendrite-demo-yggdrasil/main.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package main diff --git a/cmd/dendrite-demo-yggdrasil/signing/fetcher.go b/cmd/dendrite-demo-yggdrasil/signing/fetcher.go index bf911c6da..523f6c575 100644 --- a/cmd/dendrite-demo-yggdrasil/signing/fetcher.go +++ b/cmd/dendrite-demo-yggdrasil/signing/fetcher.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package signing diff --git a/cmd/dendrite-demo-yggdrasil/yggconn/node.go b/cmd/dendrite-demo-yggdrasil/yggconn/node.go index cee02e1b7..09683d5bb 100644 --- a/cmd/dendrite-demo-yggdrasil/yggconn/node.go +++ b/cmd/dendrite-demo-yggdrasil/yggconn/node.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package yggconn diff --git a/cmd/dendrite-demo-yggdrasil/yggrooms/yggrooms.go b/cmd/dendrite-demo-yggdrasil/yggrooms/yggrooms.go index 1a48744b7..429700d8f 100644 --- a/cmd/dendrite-demo-yggdrasil/yggrooms/yggrooms.go +++ b/cmd/dendrite-demo-yggdrasil/yggrooms/yggrooms.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package yggrooms diff --git a/cmd/dendrite/main.go b/cmd/dendrite/main.go index 504e90b70..1a1a9f4cb 100644 --- a/cmd/dendrite/main.go +++ b/cmd/dendrite/main.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package main diff --git a/cmd/generate-keys/main.go b/cmd/generate-keys/main.go index 222faeaa6..43c1eca17 100644 --- a/cmd/generate-keys/main.go +++ b/cmd/generate-keys/main.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package main diff --git a/contrib/dendrite-demo-i2p/main.go b/contrib/dendrite-demo-i2p/main.go index 7ca1500e4..107bab888 100644 --- a/contrib/dendrite-demo-i2p/main.go +++ b/contrib/dendrite-demo-i2p/main.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package main diff --git a/contrib/dendrite-demo-i2p/main_i2p.go b/contrib/dendrite-demo-i2p/main_i2p.go index f05601311..ab86afd68 100644 --- a/contrib/dendrite-demo-i2p/main_i2p.go +++ b/contrib/dendrite-demo-i2p/main_i2p.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package main diff --git a/contrib/dendrite-demo-tor/main.go b/contrib/dendrite-demo-tor/main.go index 8a078ba43..22d7c715b 100644 --- a/contrib/dendrite-demo-tor/main.go +++ b/contrib/dendrite-demo-tor/main.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package main diff --git a/contrib/dendrite-demo-tor/main_tor.go b/contrib/dendrite-demo-tor/main_tor.go index 6df50cb01..7826759f4 100644 --- a/contrib/dendrite-demo-tor/main_tor.go +++ b/contrib/dendrite-demo-tor/main_tor.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package main diff --git a/federationapi/consumers/keychange.go b/federationapi/consumers/keychange.go index e7623eafc..10edea8e6 100644 --- a/federationapi/consumers/keychange.go +++ b/federationapi/consumers/keychange.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/federationapi/consumers/presence.go b/federationapi/consumers/presence.go index 964b111c1..9f8bb8f25 100644 --- a/federationapi/consumers/presence.go +++ b/federationapi/consumers/presence.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/federationapi/consumers/receipts.go b/federationapi/consumers/receipts.go index 83cfa0dd4..f0267ebad 100644 --- a/federationapi/consumers/receipts.go +++ b/federationapi/consumers/receipts.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/federationapi/consumers/roomserver.go b/federationapi/consumers/roomserver.go index 9935f662c..a0442ce90 100644 --- a/federationapi/consumers/roomserver.go +++ b/federationapi/consumers/roomserver.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/federationapi/consumers/roomserver_test.go b/federationapi/consumers/roomserver_test.go index 5c0e46a3e..1acaba03c 100644 --- a/federationapi/consumers/roomserver_test.go +++ b/federationapi/consumers/roomserver_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/federationapi/consumers/sendtodevice.go b/federationapi/consumers/sendtodevice.go index 3e018fc7d..4f86b8cbe 100644 --- a/federationapi/consumers/sendtodevice.go +++ b/federationapi/consumers/sendtodevice.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/federationapi/consumers/typing.go b/federationapi/consumers/typing.go index 94ff165d5..6727d28ce 100644 --- a/federationapi/consumers/typing.go +++ b/federationapi/consumers/typing.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/federationapi/federationapi.go b/federationapi/federationapi.go index 88b9bc179..075f673db 100644 --- a/federationapi/federationapi.go +++ b/federationapi/federationapi.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package federationapi diff --git a/federationapi/internal/federationclient_test.go b/federationapi/internal/federationclient_test.go index d3e8f172e..87842a466 100644 --- a/federationapi/internal/federationclient_test.go +++ b/federationapi/internal/federationclient_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/federationapi/internal/perform_test.go b/federationapi/internal/perform_test.go index b5c278b3d..424cf559d 100644 --- a/federationapi/internal/perform_test.go +++ b/federationapi/internal/perform_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/federationapi/producers/syncapi.go b/federationapi/producers/syncapi.go index 08e67697c..b7192f80e 100644 --- a/federationapi/producers/syncapi.go +++ b/federationapi/producers/syncapi.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package producers diff --git a/federationapi/queue/destinationqueue.go b/federationapi/queue/destinationqueue.go index 9e069a6a4..136ad5098 100644 --- a/federationapi/queue/destinationqueue.go +++ b/federationapi/queue/destinationqueue.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package queue diff --git a/federationapi/queue/queue.go b/federationapi/queue/queue.go index a23645863..589faea0b 100644 --- a/federationapi/queue/queue.go +++ b/federationapi/queue/queue.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package queue diff --git a/federationapi/queue/queue_test.go b/federationapi/queue/queue_test.go index 54be03176..7a3ad079b 100644 --- a/federationapi/queue/queue_test.go +++ b/federationapi/queue/queue_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package queue diff --git a/federationapi/routing/backfill.go b/federationapi/routing/backfill.go index ae6524b0c..945975d6f 100644 --- a/federationapi/routing/backfill.go +++ b/federationapi/routing/backfill.go @@ -1,7 +1,7 @@ // Copyright 2018-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/devices.go b/federationapi/routing/devices.go index 4473d8c4a..4c186dc67 100644 --- a/federationapi/routing/devices.go +++ b/federationapi/routing/devices.go @@ -1,7 +1,7 @@ // Copyright 2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/eventauth.go b/federationapi/routing/eventauth.go index 2a7fe5e3c..9738484e4 100644 --- a/federationapi/routing/eventauth.go +++ b/federationapi/routing/eventauth.go @@ -1,7 +1,7 @@ // Copyright 2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/events.go b/federationapi/routing/events.go index b416384af..d68208a4f 100644 --- a/federationapi/routing/events.go +++ b/federationapi/routing/events.go @@ -1,7 +1,7 @@ // Copyright 2017-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/invite.go b/federationapi/routing/invite.go index d35e8ac05..43f515864 100644 --- a/federationapi/routing/invite.go +++ b/federationapi/routing/invite.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/join.go b/federationapi/routing/join.go index fc1555cd2..6b2c1a9b7 100644 --- a/federationapi/routing/join.go +++ b/federationapi/routing/join.go @@ -1,7 +1,7 @@ // Copyright 2017-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/keys.go b/federationapi/routing/keys.go index 36a18e900..10f26a12b 100644 --- a/federationapi/routing/keys.go +++ b/federationapi/routing/keys.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/leave.go b/federationapi/routing/leave.go index 679c23064..5e3206812 100644 --- a/federationapi/routing/leave.go +++ b/federationapi/routing/leave.go @@ -1,7 +1,7 @@ // Copyright 2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/missingevents.go b/federationapi/routing/missingevents.go index b92941d01..fc0e91121 100644 --- a/federationapi/routing/missingevents.go +++ b/federationapi/routing/missingevents.go @@ -1,7 +1,7 @@ // Copyright 2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/openid.go b/federationapi/routing/openid.go index 1cd8fd37b..af3506b2d 100644 --- a/federationapi/routing/openid.go +++ b/federationapi/routing/openid.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/peek.go b/federationapi/routing/peek.go index 214f5c5a3..580858d80 100644 --- a/federationapi/routing/peek.go +++ b/federationapi/routing/peek.go @@ -1,7 +1,7 @@ // Copyright 2020-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/profile.go b/federationapi/routing/profile.go index ca2e682be..f4826c181 100644 --- a/federationapi/routing/profile.go +++ b/federationapi/routing/profile.go @@ -1,7 +1,7 @@ // Copyright 2017-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/profile_test.go b/federationapi/routing/profile_test.go index df8b24703..f52d2e625 100644 --- a/federationapi/routing/profile_test.go +++ b/federationapi/routing/profile_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing_test diff --git a/federationapi/routing/query.go b/federationapi/routing/query.go index c528d6b6b..7c906bb76 100644 --- a/federationapi/routing/query.go +++ b/federationapi/routing/query.go @@ -1,7 +1,7 @@ // Copyright 2017-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/query_test.go b/federationapi/routing/query_test.go index 8124bb33e..b9a7ab297 100644 --- a/federationapi/routing/query_test.go +++ b/federationapi/routing/query_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing_test diff --git a/federationapi/routing/routing.go b/federationapi/routing/routing.go index 9481f095f..3073a512d 100644 --- a/federationapi/routing/routing.go +++ b/federationapi/routing/routing.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/send.go b/federationapi/routing/send.go index 4bd2db002..076462785 100644 --- a/federationapi/routing/send.go +++ b/federationapi/routing/send.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/send_test.go b/federationapi/routing/send_test.go index 8e71753a9..b0dfda96b 100644 --- a/federationapi/routing/send_test.go +++ b/federationapi/routing/send_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing_test diff --git a/federationapi/routing/state.go b/federationapi/routing/state.go index 5d9cef9b1..03dd8a0c0 100644 --- a/federationapi/routing/state.go +++ b/federationapi/routing/state.go @@ -1,7 +1,7 @@ // Copyright 2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/threepid.go b/federationapi/routing/threepid.go index 269c9a7be..4e3dfdd51 100644 --- a/federationapi/routing/threepid.go +++ b/federationapi/routing/threepid.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/routing/version.go b/federationapi/routing/version.go index e6857697d..b9e7e8043 100644 --- a/federationapi/routing/version.go +++ b/federationapi/routing/version.go @@ -1,7 +1,7 @@ // Copyright 2017-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/federationapi/storage/interface.go b/federationapi/storage/interface.go index c7e5c06a4..cba701f86 100644 --- a/federationapi/storage/interface.go +++ b/federationapi/storage/interface.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package storage diff --git a/federationapi/storage/postgres/assumed_offline_table.go b/federationapi/storage/postgres/assumed_offline_table.go index 052d2034b..6cc29391b 100644 --- a/federationapi/storage/postgres/assumed_offline_table.go +++ b/federationapi/storage/postgres/assumed_offline_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/blacklist_table.go b/federationapi/storage/postgres/blacklist_table.go index bf1313923..02bb8c981 100644 --- a/federationapi/storage/postgres/blacklist_table.go +++ b/federationapi/storage/postgres/blacklist_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/deltas/2021020411080000_rooms.go b/federationapi/storage/postgres/deltas/2021020411080000_rooms.go index 63040545a..7c247e0c3 100644 --- a/federationapi/storage/postgres/deltas/2021020411080000_rooms.go +++ b/federationapi/storage/postgres/deltas/2021020411080000_rooms.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/federationapi/storage/postgres/deltas/2022042812473400_addexpiresat.go b/federationapi/storage/postgres/deltas/2022042812473400_addexpiresat.go index 34b6258f2..dfeb5479f 100644 --- a/federationapi/storage/postgres/deltas/2022042812473400_addexpiresat.go +++ b/federationapi/storage/postgres/deltas/2022042812473400_addexpiresat.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/federationapi/storage/postgres/inbound_peeks_table.go b/federationapi/storage/postgres/inbound_peeks_table.go index 45484e563..3fe988f4f 100644 --- a/federationapi/storage/postgres/inbound_peeks_table.go +++ b/federationapi/storage/postgres/inbound_peeks_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/joined_hosts_table.go b/federationapi/storage/postgres/joined_hosts_table.go index be27aba86..08dbf744b 100644 --- a/federationapi/storage/postgres/joined_hosts_table.go +++ b/federationapi/storage/postgres/joined_hosts_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/notary_server_keys_json_table.go b/federationapi/storage/postgres/notary_server_keys_json_table.go index e4f8a870d..a21259136 100644 --- a/federationapi/storage/postgres/notary_server_keys_json_table.go +++ b/federationapi/storage/postgres/notary_server_keys_json_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/notary_server_keys_metadata_table.go b/federationapi/storage/postgres/notary_server_keys_metadata_table.go index ca8fae5cd..20573f39c 100644 --- a/federationapi/storage/postgres/notary_server_keys_metadata_table.go +++ b/federationapi/storage/postgres/notary_server_keys_metadata_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/outbound_peeks_table.go b/federationapi/storage/postgres/outbound_peeks_table.go index 47b2dd92a..02e1f1f87 100644 --- a/federationapi/storage/postgres/outbound_peeks_table.go +++ b/federationapi/storage/postgres/outbound_peeks_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/queue_edus_table.go b/federationapi/storage/postgres/queue_edus_table.go index 394899ee4..2767c520d 100644 --- a/federationapi/storage/postgres/queue_edus_table.go +++ b/federationapi/storage/postgres/queue_edus_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/queue_json_table.go b/federationapi/storage/postgres/queue_json_table.go index c9e6bc4ce..2b93bfdcd 100644 --- a/federationapi/storage/postgres/queue_json_table.go +++ b/federationapi/storage/postgres/queue_json_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/queue_pdus_table.go b/federationapi/storage/postgres/queue_pdus_table.go index 4d321620f..460113344 100644 --- a/federationapi/storage/postgres/queue_pdus_table.go +++ b/federationapi/storage/postgres/queue_pdus_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/relay_servers_table.go b/federationapi/storage/postgres/relay_servers_table.go index 47b69db98..7ca7ad350 100644 --- a/federationapi/storage/postgres/relay_servers_table.go +++ b/federationapi/storage/postgres/relay_servers_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/server_key_table.go b/federationapi/storage/postgres/server_key_table.go index b342c6f57..632dfd17c 100644 --- a/federationapi/storage/postgres/server_key_table.go +++ b/federationapi/storage/postgres/server_key_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/federationapi/storage/postgres/storage.go b/federationapi/storage/postgres/storage.go index 2145932f7..4a5fc9777 100644 --- a/federationapi/storage/postgres/storage.go +++ b/federationapi/storage/postgres/storage.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/federationapi/storage/shared/receipt/receipt.go b/federationapi/storage/shared/receipt/receipt.go index e4d56853b..71613ba34 100644 --- a/federationapi/storage/shared/receipt/receipt.go +++ b/federationapi/storage/shared/receipt/receipt.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. // A Receipt contains the NIDs of a call to GetNextTransactionPDUs/EDUs. // We don't actually export the NIDs but we need the caller to be able // to pass them back so that we can clean up if the transaction sends diff --git a/federationapi/storage/shared/storage.go b/federationapi/storage/shared/storage.go index 271f99fbc..19b870b27 100644 --- a/federationapi/storage/shared/storage.go +++ b/federationapi/storage/shared/storage.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package shared diff --git a/federationapi/storage/shared/storage_edus.go b/federationapi/storage/shared/storage_edus.go index c764f00d2..2dbed8813 100644 --- a/federationapi/storage/shared/storage_edus.go +++ b/federationapi/storage/shared/storage_edus.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package shared diff --git a/federationapi/storage/shared/storage_keys.go b/federationapi/storage/shared/storage_keys.go index 751d3a5ea..630984f15 100644 --- a/federationapi/storage/shared/storage_keys.go +++ b/federationapi/storage/shared/storage_keys.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package shared diff --git a/federationapi/storage/shared/storage_pdus.go b/federationapi/storage/shared/storage_pdus.go index f2729469b..93434e3b2 100644 --- a/federationapi/storage/shared/storage_pdus.go +++ b/federationapi/storage/shared/storage_pdus.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package shared diff --git a/federationapi/storage/sqlite3/assumed_offline_table.go b/federationapi/storage/sqlite3/assumed_offline_table.go index 962c1fcd2..8dcd838ed 100644 --- a/federationapi/storage/sqlite3/assumed_offline_table.go +++ b/federationapi/storage/sqlite3/assumed_offline_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/blacklist_table.go b/federationapi/storage/sqlite3/blacklist_table.go index b35fa0f67..60f421d7c 100644 --- a/federationapi/storage/sqlite3/blacklist_table.go +++ b/federationapi/storage/sqlite3/blacklist_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/deltas/2021020411080000_rooms.go b/federationapi/storage/sqlite3/deltas/2021020411080000_rooms.go index 63040545a..7c247e0c3 100644 --- a/federationapi/storage/sqlite3/deltas/2021020411080000_rooms.go +++ b/federationapi/storage/sqlite3/deltas/2021020411080000_rooms.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/federationapi/storage/sqlite3/deltas/2022042812473400_addexpiresat.go b/federationapi/storage/sqlite3/deltas/2022042812473400_addexpiresat.go index d0089a551..e4a04f60f 100644 --- a/federationapi/storage/sqlite3/deltas/2022042812473400_addexpiresat.go +++ b/federationapi/storage/sqlite3/deltas/2022042812473400_addexpiresat.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/federationapi/storage/sqlite3/inbound_peeks_table.go b/federationapi/storage/sqlite3/inbound_peeks_table.go index 56957a563..aa449c9ad 100644 --- a/federationapi/storage/sqlite3/inbound_peeks_table.go +++ b/federationapi/storage/sqlite3/inbound_peeks_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/joined_hosts_table.go b/federationapi/storage/sqlite3/joined_hosts_table.go index 6588667c7..feba74288 100644 --- a/federationapi/storage/sqlite3/joined_hosts_table.go +++ b/federationapi/storage/sqlite3/joined_hosts_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/notary_server_keys_json_table.go b/federationapi/storage/sqlite3/notary_server_keys_json_table.go index 2c2980581..9972765d1 100644 --- a/federationapi/storage/sqlite3/notary_server_keys_json_table.go +++ b/federationapi/storage/sqlite3/notary_server_keys_json_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go b/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go index cf2e21aa3..2dba53e7d 100644 --- a/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go +++ b/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/outbound_peeks_table.go b/federationapi/storage/sqlite3/outbound_peeks_table.go index 18a87864a..b0a442b4b 100644 --- a/federationapi/storage/sqlite3/outbound_peeks_table.go +++ b/federationapi/storage/sqlite3/outbound_peeks_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/queue_edus_table.go b/federationapi/storage/sqlite3/queue_edus_table.go index 0979c95c0..331db83ca 100644 --- a/federationapi/storage/sqlite3/queue_edus_table.go +++ b/federationapi/storage/sqlite3/queue_edus_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/queue_json_table.go b/federationapi/storage/sqlite3/queue_json_table.go index a84e740dd..ddf009faa 100644 --- a/federationapi/storage/sqlite3/queue_json_table.go +++ b/federationapi/storage/sqlite3/queue_json_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/queue_pdus_table.go b/federationapi/storage/sqlite3/queue_pdus_table.go index 667a4de8d..9eb67077f 100644 --- a/federationapi/storage/sqlite3/queue_pdus_table.go +++ b/federationapi/storage/sqlite3/queue_pdus_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/relay_servers_table.go b/federationapi/storage/sqlite3/relay_servers_table.go index 98eb27a47..ee83167df 100644 --- a/federationapi/storage/sqlite3/relay_servers_table.go +++ b/federationapi/storage/sqlite3/relay_servers_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/server_key_table.go b/federationapi/storage/sqlite3/server_key_table.go index 1bc7ce271..310c12ed0 100644 --- a/federationapi/storage/sqlite3/server_key_table.go +++ b/federationapi/storage/sqlite3/server_key_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/sqlite3/storage.go b/federationapi/storage/sqlite3/storage.go index e7f9490b1..c0a06d120 100644 --- a/federationapi/storage/sqlite3/storage.go +++ b/federationapi/storage/sqlite3/storage.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/federationapi/storage/storage.go b/federationapi/storage/storage.go index 27d7f3427..abe4addb0 100644 --- a/federationapi/storage/storage.go +++ b/federationapi/storage/storage.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !wasm // +build !wasm diff --git a/federationapi/storage/storage_wasm.go b/federationapi/storage/storage_wasm.go index dad6d82b5..9f630f37d 100644 --- a/federationapi/storage/storage_wasm.go +++ b/federationapi/storage/storage_wasm.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package storage diff --git a/federationapi/storage/tables/interface.go b/federationapi/storage/tables/interface.go index d94344d02..2173a93f2 100644 --- a/federationapi/storage/tables/interface.go +++ b/federationapi/storage/tables/interface.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package tables diff --git a/federationapi/types/types.go b/federationapi/types/types.go index 8362e1b5d..2dd703162 100644 --- a/federationapi/types/types.go +++ b/federationapi/types/types.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package types diff --git a/internal/caching/cache_typing.go b/internal/caching/cache_typing.go index 4744ba63b..44bc3c7b3 100644 --- a/internal/caching/cache_typing.go +++ b/internal/caching/cache_typing.go @@ -3,8 +3,8 @@ // Copyright 2017, 2018 New Vector Ltd // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package caching diff --git a/internal/caching/cache_typing_test.go b/internal/caching/cache_typing_test.go index 661c09079..98caba2fd 100644 --- a/internal/caching/cache_typing_test.go +++ b/internal/caching/cache_typing_test.go @@ -3,8 +3,8 @@ // Copyright 2017, 2018 New Vector Ltd // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package caching diff --git a/internal/caching/caches.go b/internal/caching/caches.go index 4a9fd1c9f..28b67cabe 100644 --- a/internal/caching/caches.go +++ b/internal/caching/caches.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package caching diff --git a/internal/caching/impl_ristretto.go b/internal/caching/impl_ristretto.go index be9515d21..12b60ba90 100644 --- a/internal/caching/impl_ristretto.go +++ b/internal/caching/impl_ristretto.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package caching diff --git a/internal/eventutil/eventcontent.go b/internal/eventutil/eventcontent.go index c17097a5b..1a3222f85 100644 --- a/internal/eventutil/eventcontent.go +++ b/internal/eventutil/eventcontent.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package eventutil diff --git a/internal/eventutil/events.go b/internal/eventutil/events.go index a1dcfc408..852caab20 100644 --- a/internal/eventutil/events.go +++ b/internal/eventutil/events.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package eventutil diff --git a/internal/eventutil/types.go b/internal/eventutil/types.go index 203ff2bc3..d97193413 100644 --- a/internal/eventutil/types.go +++ b/internal/eventutil/types.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package eventutil diff --git a/internal/fulltext/bleve.go b/internal/fulltext/bleve.go index fddf3a9aa..de58e476b 100644 --- a/internal/fulltext/bleve.go +++ b/internal/fulltext/bleve.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !wasm // +build !wasm diff --git a/internal/fulltext/bleve_test.go b/internal/fulltext/bleve_test.go index b9be15a41..c71bbce82 100644 --- a/internal/fulltext/bleve_test.go +++ b/internal/fulltext/bleve_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package fulltext_test diff --git a/internal/fulltext/bleve_wasm.go b/internal/fulltext/bleve_wasm.go index 2eadf1262..5f16bd9e5 100644 --- a/internal/fulltext/bleve_wasm.go +++ b/internal/fulltext/bleve_wasm.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package fulltext diff --git a/internal/hooks/hooks.go b/internal/hooks/hooks.go index cfba601bb..25a8520cc 100644 --- a/internal/hooks/hooks.go +++ b/internal/hooks/hooks.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. // Package hooks exposes places in Dendrite where custom code can be executed, useful for MSCs. // Hooks can only be run in monolith mode. diff --git a/internal/httputil/httpapi.go b/internal/httputil/httpapi.go index b48b2b22b..d32557679 100644 --- a/internal/httputil/httpapi.go +++ b/internal/httputil/httpapi.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package httputil diff --git a/internal/httputil/httpapi_test.go b/internal/httputil/httpapi_test.go index c60c3eb6d..23797a5ea 100644 --- a/internal/httputil/httpapi_test.go +++ b/internal/httputil/httpapi_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package httputil diff --git a/internal/httputil/paths.go b/internal/httputil/paths.go index b6e175c6b..663d0e980 100644 --- a/internal/httputil/paths.go +++ b/internal/httputil/paths.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package httputil diff --git a/internal/httputil/routing.go b/internal/httputil/routing.go index 53d5d3caa..5c378c664 100644 --- a/internal/httputil/routing.go +++ b/internal/httputil/routing.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package httputil diff --git a/internal/log.go b/internal/log.go index 4954b05b1..35c35bd13 100644 --- a/internal/log.go +++ b/internal/log.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/internal/log_unix.go b/internal/log_unix.go index 9e66e4f8e..1cb54da1f 100644 --- a/internal/log_unix.go +++ b/internal/log_unix.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !windows // +build !windows diff --git a/internal/log_windows.go b/internal/log_windows.go index 7a96594e4..a23d69a6b 100644 --- a/internal/log_windows.go +++ b/internal/log_windows.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/internal/sqlutil/connection_manager.go b/internal/sqlutil/connection_manager.go index afbbf8b49..330d2215b 100644 --- a/internal/sqlutil/connection_manager.go +++ b/internal/sqlutil/connection_manager.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlutil diff --git a/internal/sqlutil/migrate.go b/internal/sqlutil/migrate.go index b9fb9bf5f..33b3f24d6 100644 --- a/internal/sqlutil/migrate.go +++ b/internal/sqlutil/migrate.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlutil diff --git a/internal/sqlutil/sql.go b/internal/sqlutil/sql.go index 38f7c364c..6b47980d8 100644 --- a/internal/sqlutil/sql.go +++ b/internal/sqlutil/sql.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlutil diff --git a/internal/sqlutil/unique_constraint.go b/internal/sqlutil/unique_constraint.go index 2defe48ca..1730c4479 100644 --- a/internal/sqlutil/unique_constraint.go +++ b/internal/sqlutil/unique_constraint.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !wasm && !cgo // +build !wasm,!cgo diff --git a/internal/sqlutil/unique_constraint_cgo.go b/internal/sqlutil/unique_constraint_cgo.go index bab7fa028..0de0db6b9 100644 --- a/internal/sqlutil/unique_constraint_cgo.go +++ b/internal/sqlutil/unique_constraint_cgo.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !wasm && cgo // +build !wasm,cgo diff --git a/internal/sqlutil/unique_constraint_wasm.go b/internal/sqlutil/unique_constraint_wasm.go index 86030a391..391c78beb 100644 --- a/internal/sqlutil/unique_constraint_wasm.go +++ b/internal/sqlutil/unique_constraint_wasm.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build wasm // +build wasm diff --git a/internal/sqlutil/uri.go b/internal/sqlutil/uri.go index b95871089..c59ddc63f 100644 --- a/internal/sqlutil/uri.go +++ b/internal/sqlutil/uri.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlutil diff --git a/internal/tracing.go b/internal/tracing.go index 537c0127a..923c46737 100644 --- a/internal/tracing.go +++ b/internal/tracing.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/internal/transactionrequest.go b/internal/transactionrequest.go index b4f0ef127..26f2bcab3 100644 --- a/internal/transactionrequest.go +++ b/internal/transactionrequest.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/internal/transactionrequest_test.go b/internal/transactionrequest_test.go index 84dd9d8dd..4049e47ec 100644 --- a/internal/transactionrequest_test.go +++ b/internal/transactionrequest_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/internal/transactions/transactions.go b/internal/transactions/transactions.go index 3796b5f8a..420f5327b 100644 --- a/internal/transactions/transactions.go +++ b/internal/transactions/transactions.go @@ -1,7 +1,7 @@ // Copyright 2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package transactions diff --git a/internal/transactions/transactions_test.go b/internal/transactions/transactions_test.go index cc12c78fb..694663549 100644 --- a/internal/transactions/transactions_test.go +++ b/internal/transactions/transactions_test.go @@ -1,7 +1,7 @@ // Copyright 2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package transactions diff --git a/internal/validate.go b/internal/validate.go index 4b0667f21..24c8fcf00 100644 --- a/internal/validate.go +++ b/internal/validate.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/mediaapi/fileutils/fileutils.go b/mediaapi/fileutils/fileutils.go index 6d1dfd6d0..0f489418b 100644 --- a/mediaapi/fileutils/fileutils.go +++ b/mediaapi/fileutils/fileutils.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package fileutils diff --git a/mediaapi/mediaapi.go b/mediaapi/mediaapi.go index ff175df8b..ac20c886f 100644 --- a/mediaapi/mediaapi.go +++ b/mediaapi/mediaapi.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package mediaapi diff --git a/mediaapi/routing/download.go b/mediaapi/routing/download.go index a73d383ef..3a7e7fc90 100644 --- a/mediaapi/routing/download.go +++ b/mediaapi/routing/download.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/mediaapi/routing/routing.go b/mediaapi/routing/routing.go index ed638dc3c..006a54b9c 100644 --- a/mediaapi/routing/routing.go +++ b/mediaapi/routing/routing.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/mediaapi/routing/upload.go b/mediaapi/routing/upload.go index e3e5cb9ee..6d1680a94 100644 --- a/mediaapi/routing/upload.go +++ b/mediaapi/routing/upload.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/mediaapi/storage/interface.go b/mediaapi/storage/interface.go index 72979b3cd..e4a808e58 100644 --- a/mediaapi/storage/interface.go +++ b/mediaapi/storage/interface.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package storage diff --git a/mediaapi/storage/postgres/media_repository_table.go b/mediaapi/storage/postgres/media_repository_table.go index 5eb3e109a..64936b3db 100644 --- a/mediaapi/storage/postgres/media_repository_table.go +++ b/mediaapi/storage/postgres/media_repository_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/mediaapi/storage/postgres/mediaapi.go b/mediaapi/storage/postgres/mediaapi.go index 365c39bd5..870675687 100644 --- a/mediaapi/storage/postgres/mediaapi.go +++ b/mediaapi/storage/postgres/mediaapi.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/mediaapi/storage/postgres/thumbnail_table.go b/mediaapi/storage/postgres/thumbnail_table.go index 2f875b6f3..416516584 100644 --- a/mediaapi/storage/postgres/thumbnail_table.go +++ b/mediaapi/storage/postgres/thumbnail_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/mediaapi/storage/shared/mediaapi.go b/mediaapi/storage/shared/mediaapi.go index 2bbe2addf..ef8335b77 100644 --- a/mediaapi/storage/shared/mediaapi.go +++ b/mediaapi/storage/shared/mediaapi.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package shared diff --git a/mediaapi/storage/sqlite3/media_repository_table.go b/mediaapi/storage/sqlite3/media_repository_table.go index 27b079956..cca6773bd 100644 --- a/mediaapi/storage/sqlite3/media_repository_table.go +++ b/mediaapi/storage/sqlite3/media_repository_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/mediaapi/storage/sqlite3/mediaapi.go b/mediaapi/storage/sqlite3/mediaapi.go index ed75258d9..467450725 100644 --- a/mediaapi/storage/sqlite3/mediaapi.go +++ b/mediaapi/storage/sqlite3/mediaapi.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/mediaapi/storage/sqlite3/thumbnail_table.go b/mediaapi/storage/sqlite3/thumbnail_table.go index 7b5bfc503..2d255f79b 100644 --- a/mediaapi/storage/sqlite3/thumbnail_table.go +++ b/mediaapi/storage/sqlite3/thumbnail_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/mediaapi/storage/storage.go b/mediaapi/storage/storage.go index 1c7b8d3f9..0805b930e 100644 --- a/mediaapi/storage/storage.go +++ b/mediaapi/storage/storage.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !wasm // +build !wasm diff --git a/mediaapi/storage/storage_wasm.go b/mediaapi/storage/storage_wasm.go index 3a9369cfe..b397a5e48 100644 --- a/mediaapi/storage/storage_wasm.go +++ b/mediaapi/storage/storage_wasm.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package storage diff --git a/mediaapi/storage/tables/interface.go b/mediaapi/storage/tables/interface.go index f57ef899e..b5242e7e9 100644 --- a/mediaapi/storage/tables/interface.go +++ b/mediaapi/storage/tables/interface.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package tables diff --git a/mediaapi/thumbnailer/thumbnailer.go b/mediaapi/thumbnailer/thumbnailer.go index 216b283f6..31f616daa 100644 --- a/mediaapi/thumbnailer/thumbnailer.go +++ b/mediaapi/thumbnailer/thumbnailer.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package thumbnailer diff --git a/mediaapi/thumbnailer/thumbnailer_bimg.go b/mediaapi/thumbnailer/thumbnailer_bimg.go index 6ea70c5be..e2c297b5e 100644 --- a/mediaapi/thumbnailer/thumbnailer_bimg.go +++ b/mediaapi/thumbnailer/thumbnailer_bimg.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build bimg // +build bimg diff --git a/mediaapi/thumbnailer/thumbnailer_nfnt.go b/mediaapi/thumbnailer/thumbnailer_nfnt.go index b3c568bcb..f4a366067 100644 --- a/mediaapi/thumbnailer/thumbnailer_nfnt.go +++ b/mediaapi/thumbnailer/thumbnailer_nfnt.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !bimg // +build !bimg diff --git a/mediaapi/types/types.go b/mediaapi/types/types.go index 12c80b8e5..1a1e348ec 100644 --- a/mediaapi/types/types.go +++ b/mediaapi/types/types.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package types diff --git a/relayapi/api/api.go b/relayapi/api/api.go index ae00d123f..e3aaa46c0 100644 --- a/relayapi/api/api.go +++ b/relayapi/api/api.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package api diff --git a/relayapi/internal/api.go b/relayapi/internal/api.go index 9deb5bbcb..ea5903ddd 100644 --- a/relayapi/internal/api.go +++ b/relayapi/internal/api.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/relayapi/internal/perform.go b/relayapi/internal/perform.go index e204380f0..d24831e29 100644 --- a/relayapi/internal/perform.go +++ b/relayapi/internal/perform.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/relayapi/internal/perform_test.go b/relayapi/internal/perform_test.go index 686bec3cc..545abb941 100644 --- a/relayapi/internal/perform_test.go +++ b/relayapi/internal/perform_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/relayapi/relayapi.go b/relayapi/relayapi.go index 3ac0cdfe9..dc4df4c9b 100644 --- a/relayapi/relayapi.go +++ b/relayapi/relayapi.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package relayapi diff --git a/relayapi/relayapi_test.go b/relayapi/relayapi_test.go index 171661ba1..e4e8b25db 100644 --- a/relayapi/relayapi_test.go +++ b/relayapi/relayapi_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package relayapi_test diff --git a/relayapi/routing/relaytxn.go b/relayapi/routing/relaytxn.go index 6d53e0939..066b1b9c6 100644 --- a/relayapi/routing/relaytxn.go +++ b/relayapi/routing/relaytxn.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/relayapi/routing/relaytxn_test.go b/relayapi/routing/relaytxn_test.go index 6a6cb004f..48a96b0c1 100644 --- a/relayapi/routing/relaytxn_test.go +++ b/relayapi/routing/relaytxn_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing_test diff --git a/relayapi/routing/routing.go b/relayapi/routing/routing.go index 5fe91c51d..4d810a624 100644 --- a/relayapi/routing/routing.go +++ b/relayapi/routing/routing.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/relayapi/routing/sendrelay.go b/relayapi/routing/sendrelay.go index a5fed47c9..96342cd80 100644 --- a/relayapi/routing/sendrelay.go +++ b/relayapi/routing/sendrelay.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/relayapi/routing/sendrelay_test.go b/relayapi/routing/sendrelay_test.go index 6ae90c354..9d046e126 100644 --- a/relayapi/routing/sendrelay_test.go +++ b/relayapi/routing/sendrelay_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing_test diff --git a/relayapi/storage/interface.go b/relayapi/storage/interface.go index 076156877..269a1430c 100644 --- a/relayapi/storage/interface.go +++ b/relayapi/storage/interface.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package storage diff --git a/relayapi/storage/postgres/relay_queue_json_table.go b/relayapi/storage/postgres/relay_queue_json_table.go index f39c1738c..5b7a23336 100644 --- a/relayapi/storage/postgres/relay_queue_json_table.go +++ b/relayapi/storage/postgres/relay_queue_json_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/relayapi/storage/postgres/relay_queue_table.go b/relayapi/storage/postgres/relay_queue_table.go index 615cfbd12..c8e634654 100644 --- a/relayapi/storage/postgres/relay_queue_table.go +++ b/relayapi/storage/postgres/relay_queue_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/relayapi/storage/postgres/storage.go b/relayapi/storage/postgres/storage.go index c89cde55a..bef7482b0 100644 --- a/relayapi/storage/postgres/storage.go +++ b/relayapi/storage/postgres/storage.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/relayapi/storage/shared/storage.go b/relayapi/storage/shared/storage.go index 1b5d0d21c..456158caa 100644 --- a/relayapi/storage/shared/storage.go +++ b/relayapi/storage/shared/storage.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package shared diff --git a/relayapi/storage/sqlite3/relay_queue_json_table.go b/relayapi/storage/sqlite3/relay_queue_json_table.go index 468d9f0c0..3a8418acf 100644 --- a/relayapi/storage/sqlite3/relay_queue_json_table.go +++ b/relayapi/storage/sqlite3/relay_queue_json_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/relayapi/storage/sqlite3/relay_queue_table.go b/relayapi/storage/sqlite3/relay_queue_table.go index 1d99975a3..1cd822512 100644 --- a/relayapi/storage/sqlite3/relay_queue_table.go +++ b/relayapi/storage/sqlite3/relay_queue_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/relayapi/storage/sqlite3/storage.go b/relayapi/storage/sqlite3/storage.go index 7cfd36367..a4d1883a4 100644 --- a/relayapi/storage/sqlite3/storage.go +++ b/relayapi/storage/sqlite3/storage.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/relayapi/storage/storage.go b/relayapi/storage/storage.go index 75ed9757f..0a2b63f47 100644 --- a/relayapi/storage/storage.go +++ b/relayapi/storage/storage.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !wasm // +build !wasm diff --git a/relayapi/storage/storage_wasm.go b/relayapi/storage/storage_wasm.go index f7992cf67..86ba972a9 100644 --- a/relayapi/storage/storage_wasm.go +++ b/relayapi/storage/storage_wasm.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package storage diff --git a/relayapi/storage/tables/interface.go b/relayapi/storage/tables/interface.go index 278757f35..41b4cccc4 100644 --- a/relayapi/storage/tables/interface.go +++ b/relayapi/storage/tables/interface.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package tables diff --git a/relayapi/storage/tables/relay_queue_json_table_test.go b/relayapi/storage/tables/relay_queue_json_table_test.go index f2c378e46..e3951a4f5 100644 --- a/relayapi/storage/tables/relay_queue_json_table_test.go +++ b/relayapi/storage/tables/relay_queue_json_table_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package tables_test diff --git a/relayapi/storage/tables/relay_queue_table_test.go b/relayapi/storage/tables/relay_queue_table_test.go index c3be26438..8c94d5540 100644 --- a/relayapi/storage/tables/relay_queue_table_test.go +++ b/relayapi/storage/tables/relay_queue_table_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package tables_test diff --git a/roomserver/acls/acls.go b/roomserver/acls/acls.go index 199aecaa9..201f36df7 100644 --- a/roomserver/acls/acls.go +++ b/roomserver/acls/acls.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package acls diff --git a/roomserver/acls/acls_test.go b/roomserver/acls/acls_test.go index 5ae9c84ad..16f3887d2 100644 --- a/roomserver/acls/acls_test.go +++ b/roomserver/acls/acls_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package acls diff --git a/roomserver/api/alias.go b/roomserver/api/alias.go index c7e6f31f5..7efe40921 100644 --- a/roomserver/api/alias.go +++ b/roomserver/api/alias.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package api diff --git a/roomserver/api/input.go b/roomserver/api/input.go index b687ed098..748e3ac78 100644 --- a/roomserver/api/input.go +++ b/roomserver/api/input.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. // Package api provides the types that are used to communicate with the roomserver. package api diff --git a/roomserver/api/output.go b/roomserver/api/output.go index f07c59534..4a554feef 100644 --- a/roomserver/api/output.go +++ b/roomserver/api/output.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package api diff --git a/roomserver/api/query.go b/roomserver/api/query.go index 1e82c85ee..2d784048e 100644 --- a/roomserver/api/query.go +++ b/roomserver/api/query.go @@ -3,8 +3,8 @@ // Copyright 2018 New Vector Ltd // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package api diff --git a/roomserver/api/wrapper.go b/roomserver/api/wrapper.go index a08901eba..7023e2c2f 100644 --- a/roomserver/api/wrapper.go +++ b/roomserver/api/wrapper.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package api diff --git a/roomserver/auth/auth.go b/roomserver/auth/auth.go index bbcd0ab10..cf1456192 100644 --- a/roomserver/auth/auth.go +++ b/roomserver/auth/auth.go @@ -1,7 +1,7 @@ // Copyright 2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package auth diff --git a/roomserver/internal/alias.go b/roomserver/internal/alias.go index abe2f3a84..b66cd09a8 100644 --- a/roomserver/internal/alias.go +++ b/roomserver/internal/alias.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/roomserver/internal/helpers/auth.go b/roomserver/internal/helpers/auth.go index 0d0a27449..e854d1be6 100644 --- a/roomserver/internal/helpers/auth.go +++ b/roomserver/internal/helpers/auth.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package helpers diff --git a/roomserver/internal/helpers/auth_test.go b/roomserver/internal/helpers/auth_test.go index 66c9f3c1a..3b5704a3b 100644 --- a/roomserver/internal/helpers/auth_test.go +++ b/roomserver/internal/helpers/auth_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package helpers diff --git a/roomserver/internal/input/input.go b/roomserver/internal/input/input.go index 053fdcaa0..46cd206ad 100644 --- a/roomserver/internal/input/input.go +++ b/roomserver/internal/input/input.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. // Package input contains the code processes new room events package input diff --git a/roomserver/internal/input/input_events.go b/roomserver/internal/input/input_events.go index bab5b72a6..b84db345e 100644 --- a/roomserver/internal/input/input_events.go +++ b/roomserver/internal/input/input_events.go @@ -3,8 +3,8 @@ // Copyright 2018 New Vector Ltd // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package input diff --git a/roomserver/internal/input/input_latest_events.go b/roomserver/internal/input/input_latest_events.go index 8a2973c51..47ec1d5e4 100644 --- a/roomserver/internal/input/input_latest_events.go +++ b/roomserver/internal/input/input_latest_events.go @@ -3,8 +3,8 @@ // Copyright 2018 New Vector Ltd // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package input diff --git a/roomserver/internal/input/input_membership.go b/roomserver/internal/input/input_membership.go index 26295e7d4..295428623 100644 --- a/roomserver/internal/input/input_membership.go +++ b/roomserver/internal/input/input_membership.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package input diff --git a/roomserver/internal/perform/perform_admin.go b/roomserver/internal/perform/perform_admin.go index 883d558fd..da8c92a6b 100644 --- a/roomserver/internal/perform/perform_admin.go +++ b/roomserver/internal/perform/perform_admin.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_backfill.go b/roomserver/internal/perform/perform_backfill.go index 41f784ae6..8ad255c22 100644 --- a/roomserver/internal/perform/perform_backfill.go +++ b/roomserver/internal/perform/perform_backfill.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_create_room.go b/roomserver/internal/perform/perform_create_room.go index 82696e861..d5ddb5cdb 100644 --- a/roomserver/internal/perform/perform_create_room.go +++ b/roomserver/internal/perform/perform_create_room.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_forget.go b/roomserver/internal/perform/perform_forget.go index 4d14aa5cb..d3c30a6af 100644 --- a/roomserver/internal/perform/perform_forget.go +++ b/roomserver/internal/perform/perform_forget.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_inbound_peek.go b/roomserver/internal/perform/perform_inbound_peek.go index f966b5b4f..16fa7fcce 100644 --- a/roomserver/internal/perform/perform_inbound_peek.go +++ b/roomserver/internal/perform/perform_inbound_peek.go @@ -1,7 +1,7 @@ // Copyright 2020-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_invite.go b/roomserver/internal/perform/perform_invite.go index fee865ad7..f609e6ae5 100644 --- a/roomserver/internal/perform/perform_invite.go +++ b/roomserver/internal/perform/perform_invite.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_join.go b/roomserver/internal/perform/perform_join.go index 7f4ce7f40..c58d48ff4 100644 --- a/roomserver/internal/perform/perform_join.go +++ b/roomserver/internal/perform/perform_join.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_leave.go b/roomserver/internal/perform/perform_leave.go index a39f80a64..88da777b8 100644 --- a/roomserver/internal/perform/perform_leave.go +++ b/roomserver/internal/perform/perform_leave.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_peek.go b/roomserver/internal/perform/perform_peek.go index 6a76a2890..d15a90ac3 100644 --- a/roomserver/internal/perform/perform_peek.go +++ b/roomserver/internal/perform/perform_peek.go @@ -1,7 +1,7 @@ // Copyright 2020-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_publish.go b/roomserver/internal/perform/perform_publish.go index 58453d270..be5e591a6 100644 --- a/roomserver/internal/perform/perform_publish.go +++ b/roomserver/internal/perform/perform_publish.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_unpeek.go b/roomserver/internal/perform/perform_unpeek.go index 99a9b8fa7..db17937ad 100644 --- a/roomserver/internal/perform/perform_unpeek.go +++ b/roomserver/internal/perform/perform_unpeek.go @@ -1,7 +1,7 @@ // Copyright 2020-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package perform diff --git a/roomserver/internal/perform/perform_upgrade.go b/roomserver/internal/perform/perform_upgrade.go index 707c49eb1..cf18924ea 100644 --- a/roomserver/internal/perform/perform_upgrade.go +++ b/roomserver/internal/perform/perform_upgrade.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package perform diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go index 98ff7d415..e5ee8f832 100644 --- a/roomserver/internal/query/query.go +++ b/roomserver/internal/query/query.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package query diff --git a/roomserver/internal/query/query_room_hierarchy.go b/roomserver/internal/query/query_room_hierarchy.go index 2df2042ee..2e233aea9 100644 --- a/roomserver/internal/query/query_room_hierarchy.go +++ b/roomserver/internal/query/query_room_hierarchy.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package query diff --git a/roomserver/internal/query/query_test.go b/roomserver/internal/query/query_test.go index d57484697..129bb4798 100644 --- a/roomserver/internal/query/query_test.go +++ b/roomserver/internal/query/query_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package query diff --git a/roomserver/producers/roomevent.go b/roomserver/producers/roomevent.go index be2adffa2..ce258dcc0 100644 --- a/roomserver/producers/roomevent.go +++ b/roomserver/producers/roomevent.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package producers diff --git a/roomserver/roomserver.go b/roomserver/roomserver.go index 757637d36..819102bd8 100644 --- a/roomserver/roomserver.go +++ b/roomserver/roomserver.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package roomserver diff --git a/roomserver/state/state.go b/roomserver/state/state.go index 1d3cba277..9a7669a44 100644 --- a/roomserver/state/state.go +++ b/roomserver/state/state.go @@ -3,8 +3,8 @@ // Copyright 2018 New Vector Ltd // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package state diff --git a/roomserver/state/state_test.go b/roomserver/state/state_test.go index 774bb4c21..3f38fbf01 100644 --- a/roomserver/state/state_test.go +++ b/roomserver/state/state_test.go @@ -3,8 +3,8 @@ // Copyright 2018 New Vector Ltd // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package state diff --git a/roomserver/storage/interface.go b/roomserver/storage/interface.go index b560d7d3b..49086dbaf 100644 --- a/roomserver/storage/interface.go +++ b/roomserver/storage/interface.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package storage diff --git a/roomserver/storage/postgres/deltas/20201028212440_add_forgotten_column.go b/roomserver/storage/postgres/deltas/20201028212440_add_forgotten_column.go index a28e89b5f..560767b37 100644 --- a/roomserver/storage/postgres/deltas/20201028212440_add_forgotten_column.go +++ b/roomserver/storage/postgres/deltas/20201028212440_add_forgotten_column.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go b/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go index 504a0554c..c6bb1863d 100644 --- a/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go +++ b/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/roomserver/storage/postgres/deltas/20221027084407_published_appservice.go b/roomserver/storage/postgres/deltas/20221027084407_published_appservice.go index 59b1a8d4e..4213e9611 100644 --- a/roomserver/storage/postgres/deltas/20221027084407_published_appservice.go +++ b/roomserver/storage/postgres/deltas/20221027084407_published_appservice.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/roomserver/storage/postgres/deltas/20230131091021_published_appservice_pkey.go b/roomserver/storage/postgres/deltas/20230131091021_published_appservice_pkey.go index d6d7562d9..ef0c5bf34 100644 --- a/roomserver/storage/postgres/deltas/20230131091021_published_appservice_pkey.go +++ b/roomserver/storage/postgres/deltas/20230131091021_published_appservice_pkey.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha.go b/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha.go index e597be6ac..045d7ab65 100644 --- a/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha.go +++ b/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/roomserver/storage/postgres/event_json_table.go b/roomserver/storage/postgres/event_json_table.go index d90a8a764..a8f5c67a7 100644 --- a/roomserver/storage/postgres/event_json_table.go +++ b/roomserver/storage/postgres/event_json_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/event_state_keys_table.go b/roomserver/storage/postgres/event_state_keys_table.go index 2b2708156..624ccd793 100644 --- a/roomserver/storage/postgres/event_state_keys_table.go +++ b/roomserver/storage/postgres/event_state_keys_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/event_types_table.go b/roomserver/storage/postgres/event_types_table.go index e85e9e9b9..32d2d4b1a 100644 --- a/roomserver/storage/postgres/event_types_table.go +++ b/roomserver/storage/postgres/event_types_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/events_table.go b/roomserver/storage/postgres/events_table.go index 0b5c0c50c..70eefbe7b 100644 --- a/roomserver/storage/postgres/events_table.go +++ b/roomserver/storage/postgres/events_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/invite_table.go b/roomserver/storage/postgres/invite_table.go index 2c5940cac..a626cb4eb 100644 --- a/roomserver/storage/postgres/invite_table.go +++ b/roomserver/storage/postgres/invite_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/membership_table.go b/roomserver/storage/postgres/membership_table.go index 4a743d32f..90babcbfb 100644 --- a/roomserver/storage/postgres/membership_table.go +++ b/roomserver/storage/postgres/membership_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/previous_events_table.go b/roomserver/storage/postgres/previous_events_table.go index 99018c3a5..c57c979c4 100644 --- a/roomserver/storage/postgres/previous_events_table.go +++ b/roomserver/storage/postgres/previous_events_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/published_table.go b/roomserver/storage/postgres/published_table.go index 490f0e9cb..91d309ecc 100644 --- a/roomserver/storage/postgres/published_table.go +++ b/roomserver/storage/postgres/published_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/purge_statements.go b/roomserver/storage/postgres/purge_statements.go index 49ac2df27..9f7f00755 100644 --- a/roomserver/storage/postgres/purge_statements.go +++ b/roomserver/storage/postgres/purge_statements.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/redactions_table.go b/roomserver/storage/postgres/redactions_table.go index fe8ad975e..4e99bda40 100644 --- a/roomserver/storage/postgres/redactions_table.go +++ b/roomserver/storage/postgres/redactions_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/reported_events_table.go b/roomserver/storage/postgres/reported_events_table.go index 448a99798..bf59767cc 100644 --- a/roomserver/storage/postgres/reported_events_table.go +++ b/roomserver/storage/postgres/reported_events_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/room_aliases_table.go b/roomserver/storage/postgres/room_aliases_table.go index db67a920a..5e97fe28a 100644 --- a/roomserver/storage/postgres/room_aliases_table.go +++ b/roomserver/storage/postgres/room_aliases_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/rooms_table.go b/roomserver/storage/postgres/rooms_table.go index 327c445c8..f8a6efb23 100644 --- a/roomserver/storage/postgres/rooms_table.go +++ b/roomserver/storage/postgres/rooms_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/state_block_table.go b/roomserver/storage/postgres/state_block_table.go index bb9454a7e..e77d6e51d 100644 --- a/roomserver/storage/postgres/state_block_table.go +++ b/roomserver/storage/postgres/state_block_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/state_snapshot_table.go b/roomserver/storage/postgres/state_snapshot_table.go index 178aba376..0fd1be9f1 100644 --- a/roomserver/storage/postgres/state_snapshot_table.go +++ b/roomserver/storage/postgres/state_snapshot_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/storage.go b/roomserver/storage/postgres/storage.go index 85308e9c5..9c9a5777f 100644 --- a/roomserver/storage/postgres/storage.go +++ b/roomserver/storage/postgres/storage.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/postgres/user_room_keys_table.go b/roomserver/storage/postgres/user_room_keys_table.go index e8b158fc2..7ddbde760 100644 --- a/roomserver/storage/postgres/user_room_keys_table.go +++ b/roomserver/storage/postgres/user_room_keys_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/roomserver/storage/shared/prepare.go b/roomserver/storage/shared/prepare.go index ef7ec13bd..c99ff0ce3 100644 --- a/roomserver/storage/shared/prepare.go +++ b/roomserver/storage/shared/prepare.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package shared diff --git a/roomserver/storage/sqlite3/deltas/20201028212440_add_forgotten_column.go b/roomserver/storage/sqlite3/deltas/20201028212440_add_forgotten_column.go index 5f261319b..291313a5d 100644 --- a/roomserver/storage/sqlite3/deltas/20201028212440_add_forgotten_column.go +++ b/roomserver/storage/sqlite3/deltas/20201028212440_add_forgotten_column.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/roomserver/storage/sqlite3/deltas/2021041615092700_state_blocks_refactor.go b/roomserver/storage/sqlite3/deltas/2021041615092700_state_blocks_refactor.go index d8a8c4eb5..4662e07e7 100644 --- a/roomserver/storage/sqlite3/deltas/2021041615092700_state_blocks_refactor.go +++ b/roomserver/storage/sqlite3/deltas/2021041615092700_state_blocks_refactor.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/roomserver/storage/sqlite3/deltas/20221027084407_published_appservice.go b/roomserver/storage/sqlite3/deltas/20221027084407_published_appservice.go index a2aeb7a6d..6d1a2fb06 100644 --- a/roomserver/storage/sqlite3/deltas/20221027084407_published_appservice.go +++ b/roomserver/storage/sqlite3/deltas/20221027084407_published_appservice.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha.go b/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha.go index 852962392..da37a7fef 100644 --- a/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha.go +++ b/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/roomserver/storage/sqlite3/event_json_table.go b/roomserver/storage/sqlite3/event_json_table.go index 68800bdf4..753f49e3b 100644 --- a/roomserver/storage/sqlite3/event_json_table.go +++ b/roomserver/storage/sqlite3/event_json_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/event_state_keys_table.go b/roomserver/storage/sqlite3/event_state_keys_table.go index a47ffca0c..21fdb015c 100644 --- a/roomserver/storage/sqlite3/event_state_keys_table.go +++ b/roomserver/storage/sqlite3/event_state_keys_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/event_types_table.go b/roomserver/storage/sqlite3/event_types_table.go index 323c0ca9f..db2e6d5a1 100644 --- a/roomserver/storage/sqlite3/event_types_table.go +++ b/roomserver/storage/sqlite3/event_types_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/events_table.go b/roomserver/storage/sqlite3/events_table.go index 0090abb52..a3481f1e0 100644 --- a/roomserver/storage/sqlite3/events_table.go +++ b/roomserver/storage/sqlite3/events_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/invite_table.go b/roomserver/storage/sqlite3/invite_table.go index 5618d0cb7..b2857df8a 100644 --- a/roomserver/storage/sqlite3/invite_table.go +++ b/roomserver/storage/sqlite3/invite_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/membership_table.go b/roomserver/storage/sqlite3/membership_table.go index 0b6a4f2a9..3eae14747 100644 --- a/roomserver/storage/sqlite3/membership_table.go +++ b/roomserver/storage/sqlite3/membership_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/previous_events_table.go b/roomserver/storage/sqlite3/previous_events_table.go index 6f88d7b32..3698f71b6 100644 --- a/roomserver/storage/sqlite3/previous_events_table.go +++ b/roomserver/storage/sqlite3/previous_events_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/published_table.go b/roomserver/storage/sqlite3/published_table.go index cff1afac1..3711b6e32 100644 --- a/roomserver/storage/sqlite3/published_table.go +++ b/roomserver/storage/sqlite3/published_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/purge_statements.go b/roomserver/storage/sqlite3/purge_statements.go index cef035bcb..862f9aa93 100644 --- a/roomserver/storage/sqlite3/purge_statements.go +++ b/roomserver/storage/sqlite3/purge_statements.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/redactions_table.go b/roomserver/storage/sqlite3/redactions_table.go index 8415a027d..902babc07 100644 --- a/roomserver/storage/sqlite3/redactions_table.go +++ b/roomserver/storage/sqlite3/redactions_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/reported_events_table.go b/roomserver/storage/sqlite3/reported_events_table.go index e0085ff42..215704d2c 100644 --- a/roomserver/storage/sqlite3/reported_events_table.go +++ b/roomserver/storage/sqlite3/reported_events_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/room_aliases_table.go b/roomserver/storage/sqlite3/room_aliases_table.go index 67e645235..3aa419ea7 100644 --- a/roomserver/storage/sqlite3/room_aliases_table.go +++ b/roomserver/storage/sqlite3/room_aliases_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/rooms_table.go b/roomserver/storage/sqlite3/rooms_table.go index 414cd9252..93a9bb8f3 100644 --- a/roomserver/storage/sqlite3/rooms_table.go +++ b/roomserver/storage/sqlite3/rooms_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/state_block_table.go b/roomserver/storage/sqlite3/state_block_table.go index 5c37d691a..bbe2fc3fd 100644 --- a/roomserver/storage/sqlite3/state_block_table.go +++ b/roomserver/storage/sqlite3/state_block_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/state_snapshot_table.go b/roomserver/storage/sqlite3/state_snapshot_table.go index 6b2ec70ab..13dcc55cf 100644 --- a/roomserver/storage/sqlite3/state_snapshot_table.go +++ b/roomserver/storage/sqlite3/state_snapshot_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/storage.go b/roomserver/storage/sqlite3/storage.go index f108d6731..144f2ac0f 100644 --- a/roomserver/storage/sqlite3/storage.go +++ b/roomserver/storage/sqlite3/storage.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/sqlite3/user_room_keys_table.go b/roomserver/storage/sqlite3/user_room_keys_table.go index f628300f2..7b38491de 100644 --- a/roomserver/storage/sqlite3/user_room_keys_table.go +++ b/roomserver/storage/sqlite3/user_room_keys_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/roomserver/storage/storage.go b/roomserver/storage/storage.go index 490abd200..8cdf92793 100644 --- a/roomserver/storage/storage.go +++ b/roomserver/storage/storage.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !wasm // +build !wasm diff --git a/roomserver/storage/storage_wasm.go b/roomserver/storage/storage_wasm.go index cd4280963..e8f4991b8 100644 --- a/roomserver/storage/storage_wasm.go +++ b/roomserver/storage/storage_wasm.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package storage diff --git a/roomserver/types/headered_event.go b/roomserver/types/headered_event.go index dd1694b01..89825171d 100644 --- a/roomserver/types/headered_event.go +++ b/roomserver/types/headered_event.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package types diff --git a/roomserver/types/types.go b/roomserver/types/types.go index 0256cdd9f..759066bc0 100644 --- a/roomserver/types/types.go +++ b/roomserver/types/types.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. // Package types provides the types that are used internally within the roomserver. package types diff --git a/roomserver/version/version.go b/roomserver/version/version.go index 0518f5807..5d7b72150 100644 --- a/roomserver/version/version.go +++ b/roomserver/version/version.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package version diff --git a/setup/base/base.go b/setup/base/base.go index ee2e5cadd..9b8f1f92f 100644 --- a/setup/base/base.go +++ b/setup/base/base.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package base diff --git a/setup/config/config.go b/setup/config/config.go index 1dd7cfc64..2ed30a423 100644 --- a/setup/config/config.go +++ b/setup/config/config.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package config diff --git a/setup/config/config_appservice.go b/setup/config/config_appservice.go index 29d43ac78..0385fb124 100644 --- a/setup/config/config_appservice.go +++ b/setup/config/config_appservice.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Andrew Morgan // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package config diff --git a/setup/config/config_relayapi.go b/setup/config/config_relayapi.go index 00fa9b82e..0ac36847b 100644 --- a/setup/config/config_relayapi.go +++ b/setup/config/config_relayapi.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package config diff --git a/setup/config/config_test.go b/setup/config/config_test.go index b87b1c489..263aa9f35 100644 --- a/setup/config/config_test.go +++ b/setup/config/config_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package config diff --git a/setup/flags.go b/setup/flags.go index 75d2332b9..b8c202244 100644 --- a/setup/flags.go +++ b/setup/flags.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package setup diff --git a/setup/monolith.go b/setup/monolith.go index 1b8b35f17..36d6794d6 100644 --- a/setup/monolith.go +++ b/setup/monolith.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package setup diff --git a/setup/mscs/msc2836/msc2836.go b/setup/mscs/msc2836/msc2836.go index 8a9934b9f..4322e8a2b 100644 --- a/setup/mscs/msc2836/msc2836.go +++ b/setup/mscs/msc2836/msc2836.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. // Package msc2836 'Threading' implements https://github.com/matrix-org/matrix-doc/pull/2836 package msc2836 diff --git a/setup/mscs/mscs.go b/setup/mscs/mscs.go index a8f0a44a9..fc360b5d8 100644 --- a/setup/mscs/mscs.go +++ b/setup/mscs/mscs.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. // Package mscs implements Matrix Spec Changes from https://github.com/matrix-org/matrix-doc package mscs diff --git a/syncapi/consumers/clientapi.go b/syncapi/consumers/clientapi.go index bde8916f2..e6f966b2e 100644 --- a/syncapi/consumers/clientapi.go +++ b/syncapi/consumers/clientapi.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/syncapi/consumers/keychange.go b/syncapi/consumers/keychange.go index c7b4c98be..51169d6ba 100644 --- a/syncapi/consumers/keychange.go +++ b/syncapi/consumers/keychange.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/syncapi/consumers/presence.go b/syncapi/consumers/presence.go index ec00e96e7..a13919ac5 100644 --- a/syncapi/consumers/presence.go +++ b/syncapi/consumers/presence.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/syncapi/consumers/receipts.go b/syncapi/consumers/receipts.go index 9167922ac..6278ddab5 100644 --- a/syncapi/consumers/receipts.go +++ b/syncapi/consumers/receipts.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go index 8a54bd6bf..907c2b8a9 100644 --- a/syncapi/consumers/roomserver.go +++ b/syncapi/consumers/roomserver.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/syncapi/consumers/sendtodevice.go b/syncapi/consumers/sendtodevice.go index 94d4030fd..98f57d228 100644 --- a/syncapi/consumers/sendtodevice.go +++ b/syncapi/consumers/sendtodevice.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/syncapi/consumers/typing.go b/syncapi/consumers/typing.go index f518852f1..8940cd117 100644 --- a/syncapi/consumers/typing.go +++ b/syncapi/consumers/typing.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2019 Alex Chen // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/syncapi/consumers/userapi.go b/syncapi/consumers/userapi.go index b21dffb18..89657be6e 100644 --- a/syncapi/consumers/userapi.go +++ b/syncapi/consumers/userapi.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/syncapi/internal/history_visibility.go b/syncapi/internal/history_visibility.go index 7c5cb861a..d1d00b171 100644 --- a/syncapi/internal/history_visibility.go +++ b/syncapi/internal/history_visibility.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/syncapi/internal/keychange.go b/syncapi/internal/keychange.go index 9568d71c7..4e98188ee 100644 --- a/syncapi/internal/keychange.go +++ b/syncapi/internal/keychange.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/syncapi/notifier/notifier.go b/syncapi/notifier/notifier.go index 80faebaa7..4c8fefd62 100644 --- a/syncapi/notifier/notifier.go +++ b/syncapi/notifier/notifier.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package notifier diff --git a/syncapi/notifier/notifier_test.go b/syncapi/notifier/notifier_test.go index 0796093ec..87bafdc4d 100644 --- a/syncapi/notifier/notifier_test.go +++ b/syncapi/notifier/notifier_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package notifier diff --git a/syncapi/notifier/userstream.go b/syncapi/notifier/userstream.go index cbce183dd..af88a8ddf 100644 --- a/syncapi/notifier/userstream.go +++ b/syncapi/notifier/userstream.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package notifier diff --git a/syncapi/producers/appservices.go b/syncapi/producers/appservices.go index 411473d3a..af304542c 100644 --- a/syncapi/producers/appservices.go +++ b/syncapi/producers/appservices.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package producers diff --git a/syncapi/producers/federationapi_presence.go b/syncapi/producers/federationapi_presence.go index 5b441cb23..cf7efe206 100644 --- a/syncapi/producers/federationapi_presence.go +++ b/syncapi/producers/federationapi_presence.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package producers diff --git a/syncapi/routing/context.go b/syncapi/routing/context.go index 796429bce..3f5d6e3b1 100644 --- a/syncapi/routing/context.go +++ b/syncapi/routing/context.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/syncapi/routing/filter.go b/syncapi/routing/filter.go index 326c7ff48..469127d51 100644 --- a/syncapi/routing/filter.go +++ b/syncapi/routing/filter.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Jan Christian Grünhage // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/syncapi/routing/getevent.go b/syncapi/routing/getevent.go index 27befd545..eaa7cab2f 100644 --- a/syncapi/routing/getevent.go +++ b/syncapi/routing/getevent.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/syncapi/routing/memberships.go b/syncapi/routing/memberships.go index c0a7eec27..9ce0a2eee 100644 --- a/syncapi/routing/memberships.go +++ b/syncapi/routing/memberships.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/syncapi/routing/messages.go b/syncapi/routing/messages.go index 34241cd09..8d1434abc 100644 --- a/syncapi/routing/messages.go +++ b/syncapi/routing/messages.go @@ -1,7 +1,7 @@ // Copyright 2018-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/syncapi/routing/relations.go b/syncapi/routing/relations.go index 48b05387b..81f1ef45f 100644 --- a/syncapi/routing/relations.go +++ b/syncapi/routing/relations.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/syncapi/routing/routing.go b/syncapi/routing/routing.go index 32e5e99c0..dcc78c859 100644 --- a/syncapi/routing/routing.go +++ b/syncapi/routing/routing.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/syncapi/routing/search.go b/syncapi/routing/search.go index 1c6734f9e..3024e44a4 100644 --- a/syncapi/routing/search.go +++ b/syncapi/routing/search.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package routing diff --git a/syncapi/storage/interface.go b/syncapi/storage/interface.go index 8db439e05..fec71eaa0 100644 --- a/syncapi/storage/interface.go +++ b/syncapi/storage/interface.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package storage diff --git a/syncapi/storage/postgres/account_data_table.go b/syncapi/storage/postgres/account_data_table.go index 8ee464c81..51d12591b 100644 --- a/syncapi/storage/postgres/account_data_table.go +++ b/syncapi/storage/postgres/account_data_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/backwards_extremities_table.go b/syncapi/storage/postgres/backwards_extremities_table.go index 9a96186a4..cad5b1d19 100644 --- a/syncapi/storage/postgres/backwards_extremities_table.go +++ b/syncapi/storage/postgres/backwards_extremities_table.go @@ -1,7 +1,7 @@ // Copyright 2018-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/current_room_state_table.go b/syncapi/storage/postgres/current_room_state_table.go index c5d8d5f16..506ebf0c0 100644 --- a/syncapi/storage/postgres/current_room_state_table.go +++ b/syncapi/storage/postgres/current_room_state_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/deltas/20201211125500_sequences.go b/syncapi/storage/postgres/deltas/20201211125500_sequences.go index acbd84a2d..f216cacd8 100644 --- a/syncapi/storage/postgres/deltas/20201211125500_sequences.go +++ b/syncapi/storage/postgres/deltas/20201211125500_sequences.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/syncapi/storage/postgres/deltas/20210112130000_sendtodevice_sentcolumn.go b/syncapi/storage/postgres/deltas/20210112130000_sendtodevice_sentcolumn.go index 444d1d1f7..ea25c7003 100644 --- a/syncapi/storage/postgres/deltas/20210112130000_sendtodevice_sentcolumn.go +++ b/syncapi/storage/postgres/deltas/20210112130000_sendtodevice_sentcolumn.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/syncapi/storage/postgres/deltas/2022061412000000_history_visibility_column.go b/syncapi/storage/postgres/deltas/2022061412000000_history_visibility_column.go index 7a67ef0fd..28fb68324 100644 --- a/syncapi/storage/postgres/deltas/2022061412000000_history_visibility_column.go +++ b/syncapi/storage/postgres/deltas/2022061412000000_history_visibility_column.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/syncapi/storage/postgres/deltas/20230201152200_rename_index.go b/syncapi/storage/postgres/deltas/20230201152200_rename_index.go index 6e0bf81a4..805462504 100644 --- a/syncapi/storage/postgres/deltas/20230201152200_rename_index.go +++ b/syncapi/storage/postgres/deltas/20230201152200_rename_index.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2023 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/syncapi/storage/postgres/filter_table.go b/syncapi/storage/postgres/filter_table.go index 61c1a08d3..34233f348 100644 --- a/syncapi/storage/postgres/filter_table.go +++ b/syncapi/storage/postgres/filter_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Jan Christian Grünhage // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/filtering.go b/syncapi/storage/postgres/filtering.go index ba0cc004a..0d9271332 100644 --- a/syncapi/storage/postgres/filtering.go +++ b/syncapi/storage/postgres/filtering.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Thibaut CHARLES // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/ignores_table.go b/syncapi/storage/postgres/ignores_table.go index 50c82286b..878f9be87 100644 --- a/syncapi/storage/postgres/ignores_table.go +++ b/syncapi/storage/postgres/ignores_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/invites_table.go b/syncapi/storage/postgres/invites_table.go index 2dbb6a8ef..db364f4cb 100644 --- a/syncapi/storage/postgres/invites_table.go +++ b/syncapi/storage/postgres/invites_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/memberships_table.go b/syncapi/storage/postgres/memberships_table.go index e4bcaad3d..e16a230d4 100644 --- a/syncapi/storage/postgres/memberships_table.go +++ b/syncapi/storage/postgres/memberships_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/notification_data_table.go b/syncapi/storage/postgres/notification_data_table.go index 24b3daa7b..738c04204 100644 --- a/syncapi/storage/postgres/notification_data_table.go +++ b/syncapi/storage/postgres/notification_data_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/output_room_events_table.go b/syncapi/storage/postgres/output_room_events_table.go index 357c3cb01..03633f5c8 100644 --- a/syncapi/storage/postgres/output_room_events_table.go +++ b/syncapi/storage/postgres/output_room_events_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/output_room_events_topology_table.go b/syncapi/storage/postgres/output_room_events_topology_table.go index f8a6d0dd7..c6537f75e 100644 --- a/syncapi/storage/postgres/output_room_events_topology_table.go +++ b/syncapi/storage/postgres/output_room_events_topology_table.go @@ -1,7 +1,7 @@ // Copyright 2018-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/peeks_table.go b/syncapi/storage/postgres/peeks_table.go index 242bae574..fb3ff37e1 100644 --- a/syncapi/storage/postgres/peeks_table.go +++ b/syncapi/storage/postgres/peeks_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/presence_table.go b/syncapi/storage/postgres/presence_table.go index 48b667506..f53a249d3 100644 --- a/syncapi/storage/postgres/presence_table.go +++ b/syncapi/storage/postgres/presence_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/receipt_table.go b/syncapi/storage/postgres/receipt_table.go index 94f6ef644..b5693c016 100644 --- a/syncapi/storage/postgres/receipt_table.go +++ b/syncapi/storage/postgres/receipt_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/relations_table.go b/syncapi/storage/postgres/relations_table.go index ae7327568..c0bfd09a6 100644 --- a/syncapi/storage/postgres/relations_table.go +++ b/syncapi/storage/postgres/relations_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/send_to_device_table.go b/syncapi/storage/postgres/send_to_device_table.go index 5d48ca624..3f63189a7 100644 --- a/syncapi/storage/postgres/send_to_device_table.go +++ b/syncapi/storage/postgres/send_to_device_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/postgres/syncserver.go b/syncapi/storage/postgres/syncserver.go index e6ce7254b..e6f79f465 100644 --- a/syncapi/storage/postgres/syncserver.go +++ b/syncapi/storage/postgres/syncserver.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/syncapi/storage/shared/storage_consumer.go b/syncapi/storage/shared/storage_consumer.go index 8fb0eca69..050b0987d 100644 --- a/syncapi/storage/shared/storage_consumer.go +++ b/syncapi/storage/shared/storage_consumer.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package shared diff --git a/syncapi/storage/sqlite3/account_data_table.go b/syncapi/storage/sqlite3/account_data_table.go index dad410109..b98cf2278 100644 --- a/syncapi/storage/sqlite3/account_data_table.go +++ b/syncapi/storage/sqlite3/account_data_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/backwards_extremities_table.go b/syncapi/storage/sqlite3/backwards_extremities_table.go index c3f335a60..2cdd63d86 100644 --- a/syncapi/storage/sqlite3/backwards_extremities_table.go +++ b/syncapi/storage/sqlite3/backwards_extremities_table.go @@ -1,7 +1,7 @@ // Copyright 2018-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/current_room_state_table.go b/syncapi/storage/sqlite3/current_room_state_table.go index fd12adb6b..32ae24659 100644 --- a/syncapi/storage/sqlite3/current_room_state_table.go +++ b/syncapi/storage/sqlite3/current_room_state_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/deltas/20201211125500_sequences.go b/syncapi/storage/sqlite3/deltas/20201211125500_sequences.go index f34fdf654..cbf512df0 100644 --- a/syncapi/storage/sqlite3/deltas/20201211125500_sequences.go +++ b/syncapi/storage/sqlite3/deltas/20201211125500_sequences.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/syncapi/storage/sqlite3/deltas/20210112130000_sendtodevice_sentcolumn.go b/syncapi/storage/sqlite3/deltas/20210112130000_sendtodevice_sentcolumn.go index 4a24d4d30..d9e2958fa 100644 --- a/syncapi/storage/sqlite3/deltas/20210112130000_sendtodevice_sentcolumn.go +++ b/syncapi/storage/sqlite3/deltas/20210112130000_sendtodevice_sentcolumn.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/syncapi/storage/sqlite3/deltas/2022061412000000_history_visibility_column.go b/syncapi/storage/sqlite3/deltas/2022061412000000_history_visibility_column.go index 3ffb5bfa1..0cfa010fb 100644 --- a/syncapi/storage/sqlite3/deltas/2022061412000000_history_visibility_column.go +++ b/syncapi/storage/sqlite3/deltas/2022061412000000_history_visibility_column.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/syncapi/storage/sqlite3/filter_table.go b/syncapi/storage/sqlite3/filter_table.go index dfb4d029f..f55595e0c 100644 --- a/syncapi/storage/sqlite3/filter_table.go +++ b/syncapi/storage/sqlite3/filter_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Jan Christian Grünhage // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/ignores_table.go b/syncapi/storage/sqlite3/ignores_table.go index d08296bc0..fa40ab1bc 100644 --- a/syncapi/storage/sqlite3/ignores_table.go +++ b/syncapi/storage/sqlite3/ignores_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/invites_table.go b/syncapi/storage/sqlite3/invites_table.go index 03a83aa4f..b311e80ac 100644 --- a/syncapi/storage/sqlite3/invites_table.go +++ b/syncapi/storage/sqlite3/invites_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/memberships_table.go b/syncapi/storage/sqlite3/memberships_table.go index 323bfa874..bbf5639c3 100644 --- a/syncapi/storage/sqlite3/memberships_table.go +++ b/syncapi/storage/sqlite3/memberships_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/notification_data_table.go b/syncapi/storage/sqlite3/notification_data_table.go index 748046312..9fd04d56d 100644 --- a/syncapi/storage/sqlite3/notification_data_table.go +++ b/syncapi/storage/sqlite3/notification_data_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/output_room_events_table.go b/syncapi/storage/sqlite3/output_room_events_table.go index 36892cff1..b8542a1bb 100644 --- a/syncapi/storage/sqlite3/output_room_events_table.go +++ b/syncapi/storage/sqlite3/output_room_events_table.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/output_room_events_topology_table.go b/syncapi/storage/sqlite3/output_room_events_topology_table.go index 7e91d76d4..9ef46c42e 100644 --- a/syncapi/storage/sqlite3/output_room_events_topology_table.go +++ b/syncapi/storage/sqlite3/output_room_events_topology_table.go @@ -1,7 +1,7 @@ // Copyright 2018-2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/peeks_table.go b/syncapi/storage/sqlite3/peeks_table.go index 95884eb18..30a0980d0 100644 --- a/syncapi/storage/sqlite3/peeks_table.go +++ b/syncapi/storage/sqlite3/peeks_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/presence_table.go b/syncapi/storage/sqlite3/presence_table.go index 29a2685e0..f1f905417 100644 --- a/syncapi/storage/sqlite3/presence_table.go +++ b/syncapi/storage/sqlite3/presence_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/receipt_table.go b/syncapi/storage/sqlite3/receipt_table.go index 86f88d29e..b1330d942 100644 --- a/syncapi/storage/sqlite3/receipt_table.go +++ b/syncapi/storage/sqlite3/receipt_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/relations_table.go b/syncapi/storage/sqlite3/relations_table.go index e43038818..e9048055f 100644 --- a/syncapi/storage/sqlite3/relations_table.go +++ b/syncapi/storage/sqlite3/relations_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/send_to_device_table.go b/syncapi/storage/sqlite3/send_to_device_table.go index 3eddf84d5..d9622c52c 100644 --- a/syncapi/storage/sqlite3/send_to_device_table.go +++ b/syncapi/storage/sqlite3/send_to_device_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/sqlite3/syncserver.go b/syncapi/storage/sqlite3/syncserver.go index 9d12899a6..bc6e29c0c 100644 --- a/syncapi/storage/sqlite3/syncserver.go +++ b/syncapi/storage/sqlite3/syncserver.go @@ -2,8 +2,8 @@ // Copyright 2019, 2020 The Matrix.org Foundation C.I.C. // Copyright 2017, 2018 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/syncapi/storage/storage.go b/syncapi/storage/storage.go index 806a007fb..0c8418047 100644 --- a/syncapi/storage/storage.go +++ b/syncapi/storage/storage.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !wasm // +build !wasm diff --git a/syncapi/storage/storage_wasm.go b/syncapi/storage/storage_wasm.go index a1629556e..acfd32fbb 100644 --- a/syncapi/storage/storage_wasm.go +++ b/syncapi/storage/storage_wasm.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package storage diff --git a/syncapi/storage/tables/interface.go b/syncapi/storage/tables/interface.go index 235ed95f2..cbe0f37b9 100644 --- a/syncapi/storage/tables/interface.go +++ b/syncapi/storage/tables/interface.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package tables diff --git a/syncapi/streams/stream_presence.go b/syncapi/streams/stream_presence.go index 434c57bd8..2ede6ab40 100644 --- a/syncapi/streams/stream_presence.go +++ b/syncapi/streams/stream_presence.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package streams diff --git a/syncapi/sync/request.go b/syncapi/sync/request.go index 50fe2da8f..4b1c57c73 100644 --- a/syncapi/sync/request.go +++ b/syncapi/sync/request.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sync diff --git a/syncapi/sync/requestpool.go b/syncapi/sync/requestpool.go index 0e0665119..3b80d4875 100644 --- a/syncapi/sync/requestpool.go +++ b/syncapi/sync/requestpool.go @@ -3,8 +3,8 @@ // Copyright 2017, 2018 New Vector Ltd // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sync diff --git a/syncapi/syncapi.go b/syncapi/syncapi.go index aa4d2cad7..2b1dc9958 100644 --- a/syncapi/syncapi.go +++ b/syncapi/syncapi.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package syncapi diff --git a/syncapi/synctypes/clientevent.go b/syncapi/synctypes/clientevent.go index 0c297688d..640b03ea6 100644 --- a/syncapi/synctypes/clientevent.go +++ b/syncapi/synctypes/clientevent.go @@ -1,8 +1,8 @@ /* Copyright 2024 New Vector Ltd. * Copyright 2017 Vector Creations Ltd * - * SPDX-License-Identifier: AGPL-3.0-only - * Please see LICENSE in the repository root for full details. + * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial + * Please see LICENSE files in the repository root for full details. */ package synctypes diff --git a/syncapi/synctypes/clientevent_test.go b/syncapi/synctypes/clientevent_test.go index 68bbaff12..7b0699f75 100644 --- a/syncapi/synctypes/clientevent_test.go +++ b/syncapi/synctypes/clientevent_test.go @@ -1,8 +1,8 @@ /* Copyright 2024 New Vector Ltd. * Copyright 2017 Vector Creations Ltd * - * SPDX-License-Identifier: AGPL-3.0-only - * Please see LICENSE in the repository root for full details. + * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial + * Please see LICENSE files in the repository root for full details. */ package synctypes diff --git a/syncapi/synctypes/filter.go b/syncapi/synctypes/filter.go index 1b3e10483..0ffd0443b 100644 --- a/syncapi/synctypes/filter.go +++ b/syncapi/synctypes/filter.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Jan Christian Grünhage // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package synctypes diff --git a/syncapi/types/presence.go b/syncapi/types/presence.go index 1bb8abeaf..98f3b14d6 100644 --- a/syncapi/types/presence.go +++ b/syncapi/types/presence.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package types diff --git a/syncapi/types/types.go b/syncapi/types/types.go index f30cb8a74..de20a6088 100644 --- a/syncapi/types/types.go +++ b/syncapi/types/types.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package types diff --git a/test/db.go b/test/db.go index 20ecddc3a..6f117096e 100644 --- a/test/db.go +++ b/test/db.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package test diff --git a/test/event.go b/test/event.go index 474c573bf..e77bd9c3b 100644 --- a/test/event.go +++ b/test/event.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package test diff --git a/test/keyring.go b/test/keyring.go index 6782eab50..a7e5ef138 100644 --- a/test/keyring.go +++ b/test/keyring.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package test diff --git a/test/keys.go b/test/keys.go index 429d2e49c..7f160bb38 100644 --- a/test/keys.go +++ b/test/keys.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package test diff --git a/test/memory_federation_db.go b/test/memory_federation_db.go index d7cab1391..d84cb1592 100644 --- a/test/memory_federation_db.go +++ b/test/memory_federation_db.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package test diff --git a/test/memory_relay_db.go b/test/memory_relay_db.go index 16e93b565..af9faf921 100644 --- a/test/memory_relay_db.go +++ b/test/memory_relay_db.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package test diff --git a/test/room.go b/test/room.go index 8881b047d..51e563798 100644 --- a/test/room.go +++ b/test/room.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package test diff --git a/test/slice.go b/test/slice.go index f73326e0b..73beaa357 100644 --- a/test/slice.go +++ b/test/slice.go @@ -1,7 +1,7 @@ // Copyright 2024 New Vector Ltd. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package test diff --git a/test/testrig/base.go b/test/testrig/base.go index 9d67c50af..6c275a3ee 100644 --- a/test/testrig/base.go +++ b/test/testrig/base.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package testrig diff --git a/test/user.go b/test/user.go index aeed8b52a..67eea7cdc 100644 --- a/test/user.go +++ b/test/user.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package test diff --git a/test/wasm/index.js b/test/wasm/index.js index 24d8d7fb9..a3a0277a7 100755 --- a/test/wasm/index.js +++ b/test/wasm/index.js @@ -4,8 +4,8 @@ Copyright 2024 New Vector Ltd. Copyright 2021 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only -Please see LICENSE in the repository root for full details. +SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +Please see LICENSE files in the repository root for full details. */ const fs = require("fs"); diff --git a/userapi/api/api.go b/userapi/api/api.go index 5aa49681b..6da12fc9e 100644 --- a/userapi/api/api.go +++ b/userapi/api/api.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package api diff --git a/userapi/api/api_logintoken.go b/userapi/api/api_logintoken.go index a4200bdbd..b7ee9baac 100644 --- a/userapi/api/api_logintoken.go +++ b/userapi/api/api_logintoken.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package api diff --git a/userapi/consumers/clientapi.go b/userapi/consumers/clientapi.go index 9172a8d24..927996e61 100644 --- a/userapi/consumers/clientapi.go +++ b/userapi/consumers/clientapi.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/userapi/consumers/devicelistupdate.go b/userapi/consumers/devicelistupdate.go index c7e14098f..7f7f593f6 100644 --- a/userapi/consumers/devicelistupdate.go +++ b/userapi/consumers/devicelistupdate.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/userapi/consumers/signingkeyupdate.go b/userapi/consumers/signingkeyupdate.go index 3bc52364b..5f62b21d8 100644 --- a/userapi/consumers/signingkeyupdate.go +++ b/userapi/consumers/signingkeyupdate.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package consumers diff --git a/userapi/internal/api_logintoken.go b/userapi/internal/api_logintoken.go index 824973c37..d3e4d357b 100644 --- a/userapi/internal/api_logintoken.go +++ b/userapi/internal/api_logintoken.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/userapi/internal/cross_signing.go b/userapi/internal/cross_signing.go index be7ccd2f2..fe5d9f7d9 100644 --- a/userapi/internal/cross_signing.go +++ b/userapi/internal/cross_signing.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/userapi/internal/device_list_update.go b/userapi/internal/device_list_update.go index 67dd62759..cea51b4d5 100644 --- a/userapi/internal/device_list_update.go +++ b/userapi/internal/device_list_update.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/userapi/internal/device_list_update_default.go b/userapi/internal/device_list_update_default.go index ae2c25392..53c2a74b6 100644 --- a/userapi/internal/device_list_update_default.go +++ b/userapi/internal/device_list_update_default.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !vw diff --git a/userapi/internal/device_list_update_sytest.go b/userapi/internal/device_list_update_sytest.go index 177bd961c..f6021a89b 100644 --- a/userapi/internal/device_list_update_sytest.go +++ b/userapi/internal/device_list_update_sytest.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build vw diff --git a/userapi/internal/device_list_update_test.go b/userapi/internal/device_list_update_test.go index 815f803c9..8b450104e 100644 --- a/userapi/internal/device_list_update_test.go +++ b/userapi/internal/device_list_update_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/userapi/internal/key_api.go b/userapi/internal/key_api.go index ff15f7e52..09ead2c57 100644 --- a/userapi/internal/key_api.go +++ b/userapi/internal/key_api.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/userapi/internal/user_api.go b/userapi/internal/user_api.go index 4344a17ed..666e75f93 100644 --- a/userapi/internal/user_api.go +++ b/userapi/internal/user_api.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package internal diff --git a/userapi/producers/keychange.go b/userapi/producers/keychange.go index 2ff35222c..b69340d9f 100644 --- a/userapi/producers/keychange.go +++ b/userapi/producers/keychange.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package producers diff --git a/userapi/storage/interface.go b/userapi/storage/interface.go index bc996f3f5..7767f6cdb 100644 --- a/userapi/storage/interface.go +++ b/userapi/storage/interface.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package storage diff --git a/userapi/storage/postgres/account_data_table.go b/userapi/storage/postgres/account_data_table.go index 36b0745ae..251b3c3fa 100644 --- a/userapi/storage/postgres/account_data_table.go +++ b/userapi/storage/postgres/account_data_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/accounts_table.go b/userapi/storage/postgres/accounts_table.go index 6333deb72..489017fb9 100644 --- a/userapi/storage/postgres/accounts_table.go +++ b/userapi/storage/postgres/accounts_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/cross_signing_keys_table.go b/userapi/storage/postgres/cross_signing_keys_table.go index 56970cd96..a8566e69b 100644 --- a/userapi/storage/postgres/cross_signing_keys_table.go +++ b/userapi/storage/postgres/cross_signing_keys_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/cross_signing_sigs_table.go b/userapi/storage/postgres/cross_signing_sigs_table.go index a46d092f4..5797b067e 100644 --- a/userapi/storage/postgres/cross_signing_sigs_table.go +++ b/userapi/storage/postgres/cross_signing_sigs_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/deltas/2022012016470000_key_changes.go b/userapi/storage/postgres/deltas/2022012016470000_key_changes.go index 8bb726a50..68ae1e83b 100644 --- a/userapi/storage/postgres/deltas/2022012016470000_key_changes.go +++ b/userapi/storage/postgres/deltas/2022012016470000_key_changes.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/userapi/storage/postgres/deltas/2022042612000000_xsigning_idx.go b/userapi/storage/postgres/deltas/2022042612000000_xsigning_idx.go index fee0d8c9a..6bf6c7e73 100644 --- a/userapi/storage/postgres/deltas/2022042612000000_xsigning_idx.go +++ b/userapi/storage/postgres/deltas/2022042612000000_xsigning_idx.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/userapi/storage/postgres/device_keys_table.go b/userapi/storage/postgres/device_keys_table.go index fb37f3818..02c141a22 100644 --- a/userapi/storage/postgres/device_keys_table.go +++ b/userapi/storage/postgres/device_keys_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/devices_table.go b/userapi/storage/postgres/devices_table.go index a151270bf..a12e4b173 100644 --- a/userapi/storage/postgres/devices_table.go +++ b/userapi/storage/postgres/devices_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/key_backup_table.go b/userapi/storage/postgres/key_backup_table.go index a575d984b..df25ea12d 100644 --- a/userapi/storage/postgres/key_backup_table.go +++ b/userapi/storage/postgres/key_backup_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/key_backup_version_table.go b/userapi/storage/postgres/key_backup_version_table.go index ea52c8377..16520bad7 100644 --- a/userapi/storage/postgres/key_backup_version_table.go +++ b/userapi/storage/postgres/key_backup_version_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/key_changes_table.go b/userapi/storage/postgres/key_changes_table.go index 8d220f1d1..0d522b0be 100644 --- a/userapi/storage/postgres/key_changes_table.go +++ b/userapi/storage/postgres/key_changes_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/logintoken_table.go b/userapi/storage/postgres/logintoken_table.go index ba347b532..8d98295b3 100644 --- a/userapi/storage/postgres/logintoken_table.go +++ b/userapi/storage/postgres/logintoken_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/notifications_table.go b/userapi/storage/postgres/notifications_table.go index 75f8df039..3afc04364 100644 --- a/userapi/storage/postgres/notifications_table.go +++ b/userapi/storage/postgres/notifications_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 Dan Peleg // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/one_time_keys_table.go b/userapi/storage/postgres/one_time_keys_table.go index 57fe5747d..397cb7d66 100644 --- a/userapi/storage/postgres/one_time_keys_table.go +++ b/userapi/storage/postgres/one_time_keys_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/profile_table.go b/userapi/storage/postgres/profile_table.go index b74f39709..9508b5710 100644 --- a/userapi/storage/postgres/profile_table.go +++ b/userapi/storage/postgres/profile_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/pusher_table.go b/userapi/storage/postgres/pusher_table.go index 91951359d..ad94eba7f 100644 --- a/userapi/storage/postgres/pusher_table.go +++ b/userapi/storage/postgres/pusher_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 Dan Peleg // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/stale_device_lists.go b/userapi/storage/postgres/stale_device_lists.go index 4e8740fe2..9e859c8af 100644 --- a/userapi/storage/postgres/stale_device_lists.go +++ b/userapi/storage/postgres/stale_device_lists.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/stats_table.go b/userapi/storage/postgres/stats_table.go index 195a73577..b11ab5910 100644 --- a/userapi/storage/postgres/stats_table.go +++ b/userapi/storage/postgres/stats_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/storage.go b/userapi/storage/postgres/storage.go index 035d9b516..696e1aa6a 100644 --- a/userapi/storage/postgres/storage.go +++ b/userapi/storage/postgres/storage.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/postgres/threepid_table.go b/userapi/storage/postgres/threepid_table.go index 5ddfdf7fc..499c5c1f1 100644 --- a/userapi/storage/postgres/threepid_table.go +++ b/userapi/storage/postgres/threepid_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package postgres diff --git a/userapi/storage/shared/storage.go b/userapi/storage/shared/storage.go index 66681f9cf..2b1885cd0 100644 --- a/userapi/storage/shared/storage.go +++ b/userapi/storage/shared/storage.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package shared diff --git a/userapi/storage/sqlite3/account_data_table.go b/userapi/storage/sqlite3/account_data_table.go index 50051a29d..689437ba9 100644 --- a/userapi/storage/sqlite3/account_data_table.go +++ b/userapi/storage/sqlite3/account_data_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/accounts_table.go b/userapi/storage/sqlite3/accounts_table.go index e33129b6e..66cc7c060 100644 --- a/userapi/storage/sqlite3/accounts_table.go +++ b/userapi/storage/sqlite3/accounts_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/constraint_wasm.go b/userapi/storage/sqlite3/constraint_wasm.go index 1ec7c42d6..8ab34339a 100644 --- a/userapi/storage/sqlite3/constraint_wasm.go +++ b/userapi/storage/sqlite3/constraint_wasm.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build wasm // +build wasm diff --git a/userapi/storage/sqlite3/cross_signing_keys_table.go b/userapi/storage/sqlite3/cross_signing_keys_table.go index 3bad0fae1..dd8923d30 100644 --- a/userapi/storage/sqlite3/cross_signing_keys_table.go +++ b/userapi/storage/sqlite3/cross_signing_keys_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/cross_signing_sigs_table.go b/userapi/storage/sqlite3/cross_signing_sigs_table.go index 19031962c..ea594bc44 100644 --- a/userapi/storage/sqlite3/cross_signing_sigs_table.go +++ b/userapi/storage/sqlite3/cross_signing_sigs_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/deltas/2022012016470000_key_changes.go b/userapi/storage/sqlite3/deltas/2022012016470000_key_changes.go index 22872cad8..62dda5d7c 100644 --- a/userapi/storage/sqlite3/deltas/2022012016470000_key_changes.go +++ b/userapi/storage/sqlite3/deltas/2022012016470000_key_changes.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/userapi/storage/sqlite3/deltas/2022042612000000_xsigning_idx.go b/userapi/storage/sqlite3/deltas/2022042612000000_xsigning_idx.go index 35113500e..4033da238 100644 --- a/userapi/storage/sqlite3/deltas/2022042612000000_xsigning_idx.go +++ b/userapi/storage/sqlite3/deltas/2022042612000000_xsigning_idx.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package deltas diff --git a/userapi/storage/sqlite3/device_keys_table.go b/userapi/storage/sqlite3/device_keys_table.go index 05710e5d0..314ab7570 100644 --- a/userapi/storage/sqlite3/device_keys_table.go +++ b/userapi/storage/sqlite3/device_keys_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/devices_table.go b/userapi/storage/sqlite3/devices_table.go index 03f0d9595..d5d1fed3d 100644 --- a/userapi/storage/sqlite3/devices_table.go +++ b/userapi/storage/sqlite3/devices_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/key_backup_table.go b/userapi/storage/sqlite3/key_backup_table.go index 9a9d8c51a..a53850b33 100644 --- a/userapi/storage/sqlite3/key_backup_table.go +++ b/userapi/storage/sqlite3/key_backup_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/key_backup_version_table.go b/userapi/storage/sqlite3/key_backup_version_table.go index c50b81672..8f0223977 100644 --- a/userapi/storage/sqlite3/key_backup_version_table.go +++ b/userapi/storage/sqlite3/key_backup_version_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/key_changes_table.go b/userapi/storage/sqlite3/key_changes_table.go index 71f54061d..19ac37c4b 100644 --- a/userapi/storage/sqlite3/key_changes_table.go +++ b/userapi/storage/sqlite3/key_changes_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/logintoken_table.go b/userapi/storage/sqlite3/logintoken_table.go index e8f7545d3..e71fc16ed 100644 --- a/userapi/storage/sqlite3/logintoken_table.go +++ b/userapi/storage/sqlite3/logintoken_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/notifications_table.go b/userapi/storage/sqlite3/notifications_table.go index e80f07b51..500e37411 100644 --- a/userapi/storage/sqlite3/notifications_table.go +++ b/userapi/storage/sqlite3/notifications_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 Dan Peleg // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/one_time_keys_table.go b/userapi/storage/sqlite3/one_time_keys_table.go index 0823ab0b6..0ef4639e6 100644 --- a/userapi/storage/sqlite3/one_time_keys_table.go +++ b/userapi/storage/sqlite3/one_time_keys_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/profile_table.go b/userapi/storage/sqlite3/profile_table.go index 4c453d2bb..47e98218f 100644 --- a/userapi/storage/sqlite3/profile_table.go +++ b/userapi/storage/sqlite3/profile_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/pusher_table.go b/userapi/storage/sqlite3/pusher_table.go index f5e080538..be76f30d1 100644 --- a/userapi/storage/sqlite3/pusher_table.go +++ b/userapi/storage/sqlite3/pusher_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 Dan Peleg // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/stale_device_lists.go b/userapi/storage/sqlite3/stale_device_lists.go index c6c265227..ab8a0f8ef 100644 --- a/userapi/storage/sqlite3/stale_device_lists.go +++ b/userapi/storage/sqlite3/stale_device_lists.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/stats_table.go b/userapi/storage/sqlite3/stats_table.go index b7262fae3..319939bc4 100644 --- a/userapi/storage/sqlite3/stats_table.go +++ b/userapi/storage/sqlite3/stats_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/storage.go b/userapi/storage/sqlite3/storage.go index b827d895f..c57cc153e 100644 --- a/userapi/storage/sqlite3/storage.go +++ b/userapi/storage/sqlite3/storage.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/sqlite3/threepid_table.go b/userapi/storage/sqlite3/threepid_table.go index e0723f8f6..6a0ea7870 100644 --- a/userapi/storage/sqlite3/threepid_table.go +++ b/userapi/storage/sqlite3/threepid_table.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2017 Vector Creations Ltd // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package sqlite3 diff --git a/userapi/storage/storage.go b/userapi/storage/storage.go index ceb2178ed..3536d88cc 100644 --- a/userapi/storage/storage.go +++ b/userapi/storage/storage.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !wasm // +build !wasm diff --git a/userapi/storage/storage_wasm.go b/userapi/storage/storage_wasm.go index 058d2c29b..3a2afdf06 100644 --- a/userapi/storage/storage_wasm.go +++ b/userapi/storage/storage_wasm.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package storage diff --git a/userapi/storage/tables/interface.go b/userapi/storage/tables/interface.go index 76cafe250..7d4cfbae4 100644 --- a/userapi/storage/tables/interface.go +++ b/userapi/storage/tables/interface.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package tables diff --git a/userapi/types/statistics.go b/userapi/types/statistics.go index 99a00a31f..235cff78c 100644 --- a/userapi/types/statistics.go +++ b/userapi/types/statistics.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package types diff --git a/userapi/types/storage.go b/userapi/types/storage.go index 7bc592259..971f3dc9a 100644 --- a/userapi/types/storage.go +++ b/userapi/types/storage.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2021 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package types diff --git a/userapi/userapi.go b/userapi/userapi.go index cddf33428..042e2fd92 100644 --- a/userapi/userapi.go +++ b/userapi/userapi.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package userapi diff --git a/userapi/userapi_test.go b/userapi/userapi_test.go index 6f3d801f6..6e33ced01 100644 --- a/userapi/userapi_test.go +++ b/userapi/userapi_test.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2020 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package userapi_test diff --git a/userapi/util/phonehomestats.go b/userapi/util/phonehomestats.go index a913c0728..9d9b46963 100644 --- a/userapi/util/phonehomestats.go +++ b/userapi/util/phonehomestats.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package util diff --git a/userapi/util/stats.go b/userapi/util/stats.go index c711c8979..aa3f38d2a 100644 --- a/userapi/util/stats.go +++ b/userapi/util/stats.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !wasm && !windows // +build !wasm,!windows diff --git a/userapi/util/stats_wasm.go b/userapi/util/stats_wasm.go index 0e3af9615..eb9cedaf1 100644 --- a/userapi/util/stats_wasm.go +++ b/userapi/util/stats_wasm.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. package util diff --git a/userapi/util/stats_windows.go b/userapi/util/stats_windows.go index 2e9def2e4..b4f93967e 100644 --- a/userapi/util/stats_windows.go +++ b/userapi/util/stats_windows.go @@ -1,8 +1,8 @@ // Copyright 2024 New Vector Ltd. // Copyright 2022 The Matrix.org Foundation C.I.C. // -// SPDX-License-Identifier: AGPL-3.0-only -// Please see LICENSE in the repository root for full details. +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. //go:build !wasm // +build !wasm From da92fd3f29fad084a849fd89d9ed03d76acf3ea9 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Fri, 18 Oct 2024 16:14:40 +0200 Subject: [PATCH 10/13] Update the CODEOWNERS to use @element-hq/dendrite-core --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 47b85b3e1..ad40f689d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @matrix-org/dendrite-core \ No newline at end of file +* @element-hq/dendrite-core From 3ca9dae95a3852a39c0ca1879a34fbf23098a9ff Mon Sep 17 00:00:00 2001 From: Till Faelligen <2353100+S7evinK@users.noreply.github.com> Date: Thu, 14 Nov 2024 13:32:24 +0100 Subject: [PATCH 11/13] Fix missed matrix-org bits, run go mod tidy --- build/dendritejs-pinecone/main.go | 28 ++++----- build/gobind-pinecone/monolith.go | 20 +++---- build/gobind-yggdrasil/monolith.go | 36 +++++------ go.mod | 37 ++++++------ go.sum | 96 ++++++++++++++---------------- 5 files changed, 106 insertions(+), 111 deletions(-) diff --git a/build/dendritejs-pinecone/main.go b/build/dendritejs-pinecone/main.go index 4f6235c54..5b3ba729f 100644 --- a/build/dendritejs-pinecone/main.go +++ b/build/dendritejs-pinecone/main.go @@ -15,21 +15,21 @@ import ( "fmt" "syscall/js" + "github.com/element-hq/dendrite/appservice" + "github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/conn" + "github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/rooms" + "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/signing" + "github.com/element-hq/dendrite/federationapi" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver" + "github.com/element-hq/dendrite/setup" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/userapi" "github.com/gorilla/mux" - "github.com/matrix-org/dendrite/appservice" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/conn" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/rooms" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/signing" - "github.com/matrix-org/dendrite/federationapi" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/setup" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/userapi" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/gomatrixserverlib" diff --git a/build/gobind-pinecone/monolith.go b/build/gobind-pinecone/monolith.go index 4cde4783e..1b55864ea 100644 --- a/build/gobind-pinecone/monolith.go +++ b/build/gobind-pinecone/monolith.go @@ -16,16 +16,16 @@ import ( "path/filepath" "strings" - "github.com/matrix-org/dendrite/clientapi/userutil" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/conduit" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/monolith" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-pinecone/relay" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/signing" - "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/setup/process" - userapiAPI "github.com/matrix-org/dendrite/userapi/api" + "github.com/element-hq/dendrite/clientapi/userutil" + "github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/conduit" + "github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/monolith" + "github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/relay" + "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/signing" + "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/setup/process" + userapiAPI "github.com/element-hq/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/pinecone/types" diff --git a/build/gobind-yggdrasil/monolith.go b/build/gobind-yggdrasil/monolith.go index 2b227d373..335028c89 100644 --- a/build/gobind-yggdrasil/monolith.go +++ b/build/gobind-yggdrasil/monolith.go @@ -12,26 +12,26 @@ import ( "path/filepath" "time" + "github.com/element-hq/dendrite/appservice" + "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/signing" + "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/yggconn" + "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/yggrooms" + "github.com/element-hq/dendrite/federationapi" + "github.com/element-hq/dendrite/federationapi/api" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/caching" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/element-hq/dendrite/roomserver" + "github.com/element-hq/dendrite/setup" + basepkg "github.com/element-hq/dendrite/setup/base" + "github.com/element-hq/dendrite/setup/config" + "github.com/element-hq/dendrite/setup/jetstream" + "github.com/element-hq/dendrite/setup/process" + "github.com/element-hq/dendrite/test" + "github.com/element-hq/dendrite/userapi" "github.com/getsentry/sentry-go" "github.com/gorilla/mux" - "github.com/matrix-org/dendrite/appservice" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/signing" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/yggconn" - "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/yggrooms" - "github.com/matrix-org/dendrite/federationapi" - "github.com/matrix-org/dendrite/federationapi/api" - "github.com/matrix-org/dendrite/internal" - "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/httputil" - "github.com/matrix-org/dendrite/internal/sqlutil" - "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/setup" - basepkg "github.com/matrix-org/dendrite/setup/base" - "github.com/matrix-org/dendrite/setup/config" - "github.com/matrix-org/dendrite/setup/jetstream" - "github.com/matrix-org/dendrite/setup/process" - "github.com/matrix-org/dendrite/test" - "github.com/matrix-org/dendrite/userapi" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/sirupsen/logrus" diff --git a/go.mod b/go.mod index f17c1a8b8..64d467698 100644 --- a/go.mod +++ b/go.mod @@ -37,19 +37,19 @@ require ( github.com/prometheus/client_golang v1.19.1 github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.9.0 - github.com/tidwall/gjson v1.17.0 + github.com/tidwall/gjson v1.18.0 github.com/tidwall/sjson v1.2.5 github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/uber/jaeger-lib v2.4.1+incompatible github.com/yggdrasil-network/yggdrasil-go v0.5.6 github.com/yggdrasil-network/yggquic v0.0.0-20240802104827-b4e97a928967 go.uber.org/atomic v1.11.0 - golang.org/x/crypto v0.27.0 + golang.org/x/crypto v0.28.0 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 golang.org/x/image v0.18.0 golang.org/x/mobile v0.0.0-20240520174638-fa72addaaa1b - golang.org/x/sync v0.8.0 - golang.org/x/term v0.24.0 + golang.org/x/sync v0.9.0 + golang.org/x/term v0.25.0 gopkg.in/h2non/bimg.v1 v1.1.9 gopkg.in/yaml.v2 v2.4.0 gotest.tools/v3 v3.4.0 @@ -110,7 +110,7 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect github.com/minio/highwayhash v1.0.3 // indirect - github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect + github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/morikuni/aec v1.0.0 // indirect @@ -128,24 +128,25 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/quic-go/quic-go v0.45.2 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect + github.com/rogpeppe/go-internal v1.13.1 // indirect github.com/rs/zerolog v1.29.1 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.1 // indirect go.etcd.io/bbolt v1.3.7 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect - go.opentelemetry.io/otel v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect - go.opentelemetry.io/otel/metric v1.28.0 // indirect - go.opentelemetry.io/otel/sdk v1.28.0 // indirect - go.opentelemetry.io/otel/trace v1.28.0 // indirect + go.opentelemetry.io/otel v1.32.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect + go.opentelemetry.io/otel/metric v1.32.0 // indirect + go.opentelemetry.io/otel/sdk v1.32.0 // indirect + go.opentelemetry.io/otel/trace v1.32.0 // indirect go.uber.org/mock v0.4.0 // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.29.0 // indirect - golang.org/x/sys v0.25.0 // indirect - golang.org/x/text v0.18.0 // indirect + golang.org/x/mod v0.18.0 // indirect + golang.org/x/net v0.30.0 // indirect + golang.org/x/sys v0.27.0 // indirect + golang.org/x/text v0.20.0 // indirect golang.org/x/time v0.6.0 // indirect - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect - google.golang.org/protobuf v1.34.2 // indirect + golang.org/x/tools v0.22.0 // indirect + google.golang.org/protobuf v1.35.1 // indirect gopkg.in/macaroon.v2 v2.1.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect maunium.net/go/maulogger/v2 v2.4.1 // indirect @@ -157,4 +158,6 @@ require ( modernc.org/token v1.1.0 // indirect ) -go 1.21.0 +go 1.22 + +toolchain go1.23.2 diff --git a/go.sum b/go.sum index b64125e3c..ad1b8164f 100644 --- a/go.sum +++ b/go.sum @@ -74,7 +74,6 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cretz/bine v0.2.0 h1:8GiDRGlTgz+o8H9DSnsl+5MeBK4HsExxgl6WgzOCuZo= github.com/cretz/bine v0.2.0/go.mod h1:WU4o9QR9wWp8AVKtTM1XD5vUHkEqnf2vVSo6dBqbetI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -177,7 +176,6 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/gologme/log v1.3.0 h1:l781G4dE+pbigClDSDzSaaYKtiueHCILUa/qSDsmHAo= github.com/gologme/log v1.3.0/go.mod h1:yKT+DvIPdDdDoPtqFrFxheooyVmoqi0BAsw+erN3wA4= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -193,8 +191,8 @@ github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB7 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 h1:ad0vkEBuk23VJzZR9nkLVG0YAoN9coASF1GusYX6AlU= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0/go.mod h1:igFoXX2ELCW06bol23DWPB5BEWfZISOzSP5K2sbLea0= github.com/h2non/filetype v1.1.3 h1:FKkx9QbD7HR/zjK1Ia5XiBsq9zdLi5Kf3zGyFTAFkGg= github.com/h2non/filetype v1.1.3/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw= @@ -254,8 +252,8 @@ github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= github.com/minio/highwayhash v1.0.3 h1:kbnuUMoHYyVl7szWjSxJnxw11k2U709jqFPPmIUyD6Q= github.com/minio/highwayhash v1.0.3/go.mod h1:GGYsuwP/fPD6Y9hMiXuapVvlIUEhFhMTh0rxU3ik1LQ= -github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA1fcDN2L11Bule0iFy3YlAI= -github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= +github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= +github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -298,7 +296,6 @@ github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwb github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -315,15 +312,14 @@ github.com/quic-go/quic-go v0.45.2 h1:DfqBmqjb4ExSdxRIb/+qXhPC+7k6+DUNZha4oeiC9f github.com/quic-go/quic-go v0.45.2/go.mod h1:1dLehS7TIR64+vxGR70GDcatWTOtMX2PUtnKsjbTurI= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= @@ -336,8 +332,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM= -github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY= +github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= @@ -367,18 +363,18 @@ go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= -go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= -go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= -go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= -go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= -go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= -go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= -go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= -go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U= +go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 h1:IJFEoHiytixx8cMiVAO+GmHR6Frwu+u5Ur8njpFO6Ac= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0/go.mod h1:3rHrKNtLIoS0oZwkY2vxi+oJcwFRWdtUyRII+so45p8= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 h1:cMyu9O88joYEaI47CnQkxO1XZdpoTF9fEnW2duIddhw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0/go.mod h1:6Am3rn7P9TVVeXYG+wtcGE7IE1tsQ+bP3AuWcKt/gOI= +go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M= +go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8= +go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4= +go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU= +go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM= +go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= @@ -394,8 +390,8 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= -golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -416,9 +412,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= +golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -429,15 +424,15 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= +golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -449,7 +444,6 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -463,16 +457,16 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= -golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= +golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -482,15 +476,14 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= +golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -498,8 +491,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= +golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -508,16 +501,16 @@ gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJ gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g= +google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= +google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= @@ -535,7 +528,6 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= maunium.net/go/maulogger/v2 v2.4.1 h1:N7zSdd0mZkB2m2JtFUsiGTQQAdP0YeFWT7YMc80yAL8= From 11b48749bf96fb1f7761df6d7a21cf1cd8484e20 Mon Sep 17 00:00:00 2001 From: Till Faelligen <2353100+S7evinK@users.noreply.github.com> Date: Thu, 14 Nov 2024 16:40:08 +0100 Subject: [PATCH 12/13] Fix linting --- build/dendritejs-pinecone/jsServer.go | 15 +++++++++------ clientapi/routing/admin.go | 2 +- clientapi/routing/membership.go | 2 +- clientapi/routing/room_hierarchy.go | 2 +- cmd/dendrite-demo-pinecone/monolith/monolith.go | 4 ++-- cmd/dendrite-demo-yggdrasil/main.go | 4 ++-- cmd/dendrite/main.go | 2 +- contrib/dendrite-demo-i2p/main.go | 2 +- contrib/dendrite-demo-i2p/main_i2p.go | 6 +++--- contrib/dendrite-demo-tor/main.go | 2 +- contrib/dendrite-demo-tor/main_tor.go | 6 +++--- federationapi/consumers/receipts.go | 2 +- federationapi/routing/profile_test.go | 2 +- federationapi/routing/query_test.go | 2 +- federationapi/routing/routing.go | 4 ++-- federationapi/routing/send_test.go | 2 +- .../storage/postgres/joined_hosts_table.go | 2 +- .../postgres/notary_server_keys_metadata_table.go | 2 +- .../storage/postgres/queue_json_table.go | 2 +- .../storage/postgres/queue_pdus_table.go | 2 +- .../storage/postgres/relay_servers_table.go | 2 +- .../storage/postgres/server_key_table.go | 2 +- internal/transactionrequest.go | 2 +- mediaapi/routing/routing.go | 2 +- mediaapi/storage/postgres/mediaapi.go | 2 +- relayapi/relayapi_test.go | 2 +- relayapi/routing/routing.go | 4 ++-- .../storage/postgres/relay_queue_json_table.go | 2 +- relayapi/storage/postgres/relay_queue_table.go | 2 +- .../internal/perform/perform_create_room.go | 2 +- .../2021041615092700_state_blocks_refactor.go | 2 +- .../deltas/20230516154000_drop_reference_sha.go | 2 +- .../20230516154000_drop_reference_sha_test.go | 2 +- .../storage/postgres/event_state_keys_table.go | 2 +- roomserver/storage/postgres/event_types_table.go | 2 +- roomserver/storage/postgres/events_table.go | 2 +- roomserver/storage/postgres/rooms_table.go | 2 +- roomserver/storage/postgres/state_block_table.go | 2 +- .../storage/postgres/user_room_keys_table.go | 2 +- .../deltas/20230516154000_drop_reference_sha.go | 2 +- setup/base/base.go | 4 ++-- setup/mscs/msc2836/msc2836_test.go | 2 +- syncapi/consumers/keychange.go | 2 +- syncapi/consumers/roomserver.go | 2 +- syncapi/storage/postgres/account_data_table.go | 2 +- .../storage/postgres/current_room_state_table.go | 2 +- .../storage/postgres/output_room_events_table.go | 2 +- syncapi/storage/postgres/syncserver.go | 2 +- syncapi/syncapi_test.go | 2 +- userapi/storage/postgres/devices_table.go | 2 +- userapi/storage/postgres/one_time_keys_table.go | 2 +- 51 files changed, 68 insertions(+), 65 deletions(-) diff --git a/build/dendritejs-pinecone/jsServer.go b/build/dendritejs-pinecone/jsServer.go index 57e1f610e..f2f60f0ba 100644 --- a/build/dendritejs-pinecone/jsServer.go +++ b/build/dendritejs-pinecone/jsServer.go @@ -26,13 +26,16 @@ type JSServer struct { // OnRequestFromJS is the function that JS will invoke when there is a new request. // The JS function signature is: -// function(reqString: string): Promise<{result: string, error: string}> +// +// function(reqString: string): Promise<{result: string, error: string}> +// // Usage is like: -// const res = await global._go_js_server.fetch(reqString); -// if (res.error) { -// // handle error: this is a 'network' error, not a non-2xx error. -// } -// const rawHttpResponse = res.result; +// +// const res = await global._go_js_server.fetch(reqString); +// if (res.error) { +// // handle error: this is a 'network' error, not a non-2xx error. +// } +// const rawHttpResponse = res.result; func (h *JSServer) OnRequestFromJS(this js.Value, args []js.Value) interface{} { // we HAVE to spawn a new goroutine and return immediately or else Go will deadlock // if this request blocks at all e.g for /sync calls diff --git a/clientapi/routing/admin.go b/clientapi/routing/admin.go index 2c8f31608..48e58209c 100644 --- a/clientapi/routing/admin.go +++ b/clientapi/routing/admin.go @@ -10,9 +10,9 @@ import ( "strconv" "time" - "github.com/gorilla/mux" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/eventutil" + "github.com/gorilla/mux" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/clientapi/routing/membership.go b/clientapi/routing/membership.go index c2b26d088..9579e6488 100644 --- a/clientapi/routing/membership.go +++ b/clientapi/routing/membership.go @@ -13,7 +13,6 @@ import ( "net/http" "time" - "github.com/getsentry/sentry-go" appserviceAPI "github.com/element-hq/dendrite/appservice/api" "github.com/element-hq/dendrite/clientapi/auth/authtypes" "github.com/element-hq/dendrite/clientapi/httputil" @@ -24,6 +23,7 @@ import ( "github.com/element-hq/dendrite/roomserver/types" "github.com/element-hq/dendrite/setup/config" userapi "github.com/element-hq/dendrite/userapi/api" + "github.com/getsentry/sentry-go" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/clientapi/routing/room_hierarchy.go b/clientapi/routing/room_hierarchy.go index c8f335500..82ee35805 100644 --- a/clientapi/routing/room_hierarchy.go +++ b/clientapi/routing/room_hierarchy.go @@ -11,10 +11,10 @@ import ( "strconv" "sync" - "github.com/google/uuid" roomserverAPI "github.com/element-hq/dendrite/roomserver/api" "github.com/element-hq/dendrite/roomserver/types" userapi "github.com/element-hq/dendrite/userapi/api" + "github.com/google/uuid" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" diff --git a/cmd/dendrite-demo-pinecone/monolith/monolith.go b/cmd/dendrite-demo-pinecone/monolith/monolith.go index d8b5f1c84..2fb5e675e 100644 --- a/cmd/dendrite-demo-pinecone/monolith/monolith.go +++ b/cmd/dendrite-demo-pinecone/monolith/monolith.go @@ -18,8 +18,6 @@ import ( "sync" "time" - "github.com/gorilla/mux" - "github.com/gorilla/websocket" "github.com/element-hq/dendrite/appservice" "github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/conn" "github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/embed" @@ -43,6 +41,8 @@ import ( "github.com/element-hq/dendrite/setup/process" "github.com/element-hq/dendrite/userapi" userAPI "github.com/element-hq/dendrite/userapi/api" + "github.com/gorilla/mux" + "github.com/gorilla/websocket" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/sirupsen/logrus" diff --git a/cmd/dendrite-demo-yggdrasil/main.go b/cmd/dendrite-demo-yggdrasil/main.go index 8a0e3ee19..2c1eea384 100644 --- a/cmd/dendrite-demo-yggdrasil/main.go +++ b/cmd/dendrite-demo-yggdrasil/main.go @@ -19,15 +19,14 @@ import ( "path/filepath" "time" - "github.com/getsentry/sentry-go" "github.com/element-hq/dendrite/internal/caching" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/setup/jetstream" "github.com/element-hq/dendrite/setup/process" + "github.com/getsentry/sentry-go" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" - "github.com/gorilla/mux" "github.com/element-hq/dendrite/appservice" "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/embed" "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/signing" @@ -44,6 +43,7 @@ import ( "github.com/element-hq/dendrite/setup/mscs" "github.com/element-hq/dendrite/test" "github.com/element-hq/dendrite/userapi" + "github.com/gorilla/mux" "github.com/sirupsen/logrus" ) diff --git a/cmd/dendrite/main.go b/cmd/dendrite/main.go index 1a1a9f4cb..da43432fb 100644 --- a/cmd/dendrite/main.go +++ b/cmd/dendrite/main.go @@ -10,13 +10,13 @@ import ( "flag" "time" - "github.com/getsentry/sentry-go" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/caching" "github.com/element-hq/dendrite/internal/httputil" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/setup/jetstream" "github.com/element-hq/dendrite/setup/process" + "github.com/getsentry/sentry-go" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" diff --git a/contrib/dendrite-demo-i2p/main.go b/contrib/dendrite-demo-i2p/main.go index 107bab888..27f69acb6 100644 --- a/contrib/dendrite-demo-i2p/main.go +++ b/contrib/dendrite-demo-i2p/main.go @@ -11,13 +11,13 @@ import ( "os" "time" - "github.com/getsentry/sentry-go" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/caching" "github.com/element-hq/dendrite/internal/httputil" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/setup/jetstream" "github.com/element-hq/dendrite/setup/process" + "github.com/getsentry/sentry-go" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" diff --git a/contrib/dendrite-demo-i2p/main_i2p.go b/contrib/dendrite-demo-i2p/main_i2p.go index ab86afd68..9104b7e11 100644 --- a/contrib/dendrite-demo-i2p/main_i2p.go +++ b/contrib/dendrite-demo-i2p/main_i2p.go @@ -19,14 +19,14 @@ import ( "text/template" "github.com/cretz/bine/tor" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/setup/process" "github.com/eyedeekay/goSam" "github.com/eyedeekay/onramp" sentryhttp "github.com/getsentry/sentry-go/http" "github.com/gorilla/mux" "github.com/kardianos/minwinsvc" - "github.com/element-hq/dendrite/internal" - "github.com/element-hq/dendrite/internal/httputil" - "github.com/element-hq/dendrite/setup/process" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" diff --git a/contrib/dendrite-demo-tor/main.go b/contrib/dendrite-demo-tor/main.go index 22d7c715b..132b557f1 100644 --- a/contrib/dendrite-demo-tor/main.go +++ b/contrib/dendrite-demo-tor/main.go @@ -10,13 +10,13 @@ import ( "os" "time" - "github.com/getsentry/sentry-go" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/caching" "github.com/element-hq/dendrite/internal/httputil" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/setup/jetstream" "github.com/element-hq/dendrite/setup/process" + "github.com/getsentry/sentry-go" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" diff --git a/contrib/dendrite-demo-tor/main_tor.go b/contrib/dendrite-demo-tor/main_tor.go index 7826759f4..8e73212a7 100644 --- a/contrib/dendrite-demo-tor/main_tor.go +++ b/contrib/dendrite-demo-tor/main_tor.go @@ -18,13 +18,13 @@ import ( "text/template" "github.com/cretz/bine/tor" + "github.com/element-hq/dendrite/internal" + "github.com/element-hq/dendrite/internal/httputil" + "github.com/element-hq/dendrite/setup/process" "github.com/eyedeekay/onramp" sentryhttp "github.com/getsentry/sentry-go/http" "github.com/gorilla/mux" "github.com/kardianos/minwinsvc" - "github.com/element-hq/dendrite/internal" - "github.com/element-hq/dendrite/internal/httputil" - "github.com/element-hq/dendrite/setup/process" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" diff --git a/federationapi/consumers/receipts.go b/federationapi/consumers/receipts.go index f0267ebad..c12340282 100644 --- a/federationapi/consumers/receipts.go +++ b/federationapi/consumers/receipts.go @@ -11,7 +11,6 @@ import ( "encoding/json" "strconv" - "github.com/getsentry/sentry-go" "github.com/element-hq/dendrite/federationapi/queue" "github.com/element-hq/dendrite/federationapi/storage" fedTypes "github.com/element-hq/dendrite/federationapi/types" @@ -19,6 +18,7 @@ import ( "github.com/element-hq/dendrite/setup/jetstream" "github.com/element-hq/dendrite/setup/process" syncTypes "github.com/element-hq/dendrite/syncapi/types" + "github.com/getsentry/sentry-go" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/nats-io/nats.go" diff --git a/federationapi/routing/profile_test.go b/federationapi/routing/profile_test.go index f52d2e625..96482b5c6 100644 --- a/federationapi/routing/profile_test.go +++ b/federationapi/routing/profile_test.go @@ -14,7 +14,6 @@ import ( "net/url" "testing" - "github.com/gorilla/mux" "github.com/element-hq/dendrite/clientapi/auth/authtypes" "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/signing" fedAPI "github.com/element-hq/dendrite/federationapi" @@ -26,6 +25,7 @@ import ( "github.com/element-hq/dendrite/test" "github.com/element-hq/dendrite/test/testrig" userAPI "github.com/element-hq/dendrite/userapi/api" + "github.com/gorilla/mux" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/federationapi/routing/query_test.go b/federationapi/routing/query_test.go index b9a7ab297..27ef4c6a4 100644 --- a/federationapi/routing/query_test.go +++ b/federationapi/routing/query_test.go @@ -14,7 +14,6 @@ import ( "net/url" "testing" - "github.com/gorilla/mux" "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/signing" fedAPI "github.com/element-hq/dendrite/federationapi" "github.com/element-hq/dendrite/federationapi/routing" @@ -24,6 +23,7 @@ import ( "github.com/element-hq/dendrite/setup/jetstream" "github.com/element-hq/dendrite/test" "github.com/element-hq/dendrite/test/testrig" + "github.com/gorilla/mux" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/federationapi/routing/routing.go b/federationapi/routing/routing.go index 3073a512d..5043722e8 100644 --- a/federationapi/routing/routing.go +++ b/federationapi/routing/routing.go @@ -14,8 +14,6 @@ import ( "sync" "time" - "github.com/getsentry/sentry-go" - "github.com/gorilla/mux" fedInternal "github.com/element-hq/dendrite/federationapi/internal" "github.com/element-hq/dendrite/federationapi/producers" "github.com/element-hq/dendrite/internal" @@ -24,6 +22,8 @@ import ( roomserverAPI "github.com/element-hq/dendrite/roomserver/api" "github.com/element-hq/dendrite/setup/config" userapi "github.com/element-hq/dendrite/userapi/api" + "github.com/getsentry/sentry-go" + "github.com/gorilla/mux" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/federationapi/routing/send_test.go b/federationapi/routing/send_test.go index b0dfda96b..c20a9d592 100644 --- a/federationapi/routing/send_test.go +++ b/federationapi/routing/send_test.go @@ -12,7 +12,6 @@ import ( "net/http/httptest" "testing" - "github.com/gorilla/mux" "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/signing" fedAPI "github.com/element-hq/dendrite/federationapi" "github.com/element-hq/dendrite/federationapi/routing" @@ -22,6 +21,7 @@ import ( "github.com/element-hq/dendrite/setup/jetstream" "github.com/element-hq/dendrite/test" "github.com/element-hq/dendrite/test/testrig" + "github.com/gorilla/mux" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/federationapi/storage/postgres/joined_hosts_table.go b/federationapi/storage/postgres/joined_hosts_table.go index 08dbf744b..4e6fed7ae 100644 --- a/federationapi/storage/postgres/joined_hosts_table.go +++ b/federationapi/storage/postgres/joined_hosts_table.go @@ -11,10 +11,10 @@ import ( "context" "database/sql" - "github.com/lib/pq" "github.com/element-hq/dendrite/federationapi/types" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/lib/pq" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/postgres/notary_server_keys_metadata_table.go b/federationapi/storage/postgres/notary_server_keys_metadata_table.go index 20573f39c..87bff1296 100644 --- a/federationapi/storage/postgres/notary_server_keys_metadata_table.go +++ b/federationapi/storage/postgres/notary_server_keys_metadata_table.go @@ -11,10 +11,10 @@ import ( "database/sql" "encoding/json" - "github.com/lib/pq" "github.com/element-hq/dendrite/federationapi/storage/tables" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/lib/pq" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/postgres/queue_json_table.go b/federationapi/storage/postgres/queue_json_table.go index 2b93bfdcd..ef0d9eab5 100644 --- a/federationapi/storage/postgres/queue_json_table.go +++ b/federationapi/storage/postgres/queue_json_table.go @@ -10,9 +10,9 @@ import ( "context" "database/sql" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/lib/pq" ) const queueJSONSchema = ` diff --git a/federationapi/storage/postgres/queue_pdus_table.go b/federationapi/storage/postgres/queue_pdus_table.go index 460113344..7748d9ca3 100644 --- a/federationapi/storage/postgres/queue_pdus_table.go +++ b/federationapi/storage/postgres/queue_pdus_table.go @@ -10,9 +10,9 @@ import ( "context" "database/sql" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/lib/pq" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/postgres/relay_servers_table.go b/federationapi/storage/postgres/relay_servers_table.go index 7ca7ad350..0a02cf919 100644 --- a/federationapi/storage/postgres/relay_servers_table.go +++ b/federationapi/storage/postgres/relay_servers_table.go @@ -10,9 +10,9 @@ import ( "context" "database/sql" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/lib/pq" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/federationapi/storage/postgres/server_key_table.go b/federationapi/storage/postgres/server_key_table.go index 632dfd17c..656ffd684 100644 --- a/federationapi/storage/postgres/server_key_table.go +++ b/federationapi/storage/postgres/server_key_table.go @@ -11,9 +11,9 @@ import ( "context" "database/sql" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/lib/pq" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/internal/transactionrequest.go b/internal/transactionrequest.go index 26f2bcab3..474195f6c 100644 --- a/internal/transactionrequest.go +++ b/internal/transactionrequest.go @@ -12,13 +12,13 @@ import ( "fmt" "sync" - "github.com/getsentry/sentry-go" "github.com/element-hq/dendrite/federationapi/producers" "github.com/element-hq/dendrite/federationapi/types" "github.com/element-hq/dendrite/roomserver/api" rstypes "github.com/element-hq/dendrite/roomserver/types" syncTypes "github.com/element-hq/dendrite/syncapi/types" userAPI "github.com/element-hq/dendrite/userapi/api" + "github.com/getsentry/sentry-go" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/mediaapi/routing/routing.go b/mediaapi/routing/routing.go index 006a54b9c..45da8eba6 100644 --- a/mediaapi/routing/routing.go +++ b/mediaapi/routing/routing.go @@ -11,13 +11,13 @@ import ( "net/http" "strings" - "github.com/gorilla/mux" "github.com/element-hq/dendrite/federationapi/routing" "github.com/element-hq/dendrite/internal/httputil" "github.com/element-hq/dendrite/mediaapi/storage" "github.com/element-hq/dendrite/mediaapi/types" "github.com/element-hq/dendrite/setup/config" userapi "github.com/element-hq/dendrite/userapi/api" + "github.com/gorilla/mux" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/mediaapi/storage/postgres/mediaapi.go b/mediaapi/storage/postgres/mediaapi.go index 870675687..199514df1 100644 --- a/mediaapi/storage/postgres/mediaapi.go +++ b/mediaapi/storage/postgres/mediaapi.go @@ -9,10 +9,10 @@ package postgres import ( // Import the postgres database driver. - _ "github.com/lib/pq" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/mediaapi/storage/shared" "github.com/element-hq/dendrite/setup/config" + _ "github.com/lib/pq" ) // NewDatabase opens a postgres database. diff --git a/relayapi/relayapi_test.go b/relayapi/relayapi_test.go index e4e8b25db..d27111bce 100644 --- a/relayapi/relayapi_test.go +++ b/relayapi/relayapi_test.go @@ -15,7 +15,6 @@ import ( "testing" "time" - "github.com/gorilla/mux" "github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/signing" "github.com/element-hq/dendrite/internal/caching" "github.com/element-hq/dendrite/internal/httputil" @@ -23,6 +22,7 @@ import ( "github.com/element-hq/dendrite/relayapi" "github.com/element-hq/dendrite/test" "github.com/element-hq/dendrite/test/testrig" + "github.com/gorilla/mux" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/relayapi/routing/routing.go b/relayapi/routing/routing.go index 4d810a624..abb397151 100644 --- a/relayapi/routing/routing.go +++ b/relayapi/routing/routing.go @@ -11,11 +11,11 @@ import ( "net/http" "time" - "github.com/getsentry/sentry-go" - "github.com/gorilla/mux" "github.com/element-hq/dendrite/internal/httputil" relayInternal "github.com/element-hq/dendrite/relayapi/internal" "github.com/element-hq/dendrite/setup/config" + "github.com/getsentry/sentry-go" + "github.com/gorilla/mux" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/relayapi/storage/postgres/relay_queue_json_table.go b/relayapi/storage/postgres/relay_queue_json_table.go index 5b7a23336..cc15a5ed1 100644 --- a/relayapi/storage/postgres/relay_queue_json_table.go +++ b/relayapi/storage/postgres/relay_queue_json_table.go @@ -10,9 +10,9 @@ import ( "context" "database/sql" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/lib/pq" ) const relayQueueJSONSchema = ` diff --git a/relayapi/storage/postgres/relay_queue_table.go b/relayapi/storage/postgres/relay_queue_table.go index c8e634654..79d5ecd8d 100644 --- a/relayapi/storage/postgres/relay_queue_table.go +++ b/relayapi/storage/postgres/relay_queue_table.go @@ -10,9 +10,9 @@ import ( "context" "database/sql" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" + "github.com/lib/pq" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/roomserver/internal/perform/perform_create_room.go b/roomserver/internal/perform/perform_create_room.go index d5ddb5cdb..73ae9ff6c 100644 --- a/roomserver/internal/perform/perform_create_room.go +++ b/roomserver/internal/perform/perform_create_room.go @@ -13,12 +13,12 @@ import ( "fmt" "net/http" - "github.com/getsentry/sentry-go" "github.com/element-hq/dendrite/internal/eventutil" "github.com/element-hq/dendrite/roomserver/api" "github.com/element-hq/dendrite/roomserver/storage" "github.com/element-hq/dendrite/roomserver/types" "github.com/element-hq/dendrite/setup/config" + "github.com/getsentry/sentry-go" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go b/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go index c6bb1863d..3c0a3fa00 100644 --- a/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go +++ b/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go @@ -11,8 +11,8 @@ import ( "database/sql" "fmt" - "github.com/lib/pq" "github.com/element-hq/dendrite/roomserver/types" + "github.com/lib/pq" "github.com/matrix-org/util" "github.com/sirupsen/logrus" ) diff --git a/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha.go b/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha.go index 045d7ab65..00cc4c66c 100644 --- a/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha.go +++ b/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha.go @@ -11,8 +11,8 @@ import ( "database/sql" "fmt" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" + "github.com/lib/pq" "github.com/matrix-org/util" ) diff --git a/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha_test.go b/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha_test.go index 7a5a029ab..9ff1003b1 100644 --- a/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha_test.go +++ b/roomserver/storage/postgres/deltas/20230516154000_drop_reference_sha_test.go @@ -3,10 +3,10 @@ package deltas import ( "testing" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/test" "github.com/element-hq/dendrite/test/testrig" + "github.com/lib/pq" "github.com/stretchr/testify/assert" ) diff --git a/roomserver/storage/postgres/event_state_keys_table.go b/roomserver/storage/postgres/event_state_keys_table.go index 624ccd793..01cfdbfd4 100644 --- a/roomserver/storage/postgres/event_state_keys_table.go +++ b/roomserver/storage/postgres/event_state_keys_table.go @@ -11,11 +11,11 @@ import ( "context" "database/sql" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/roomserver/storage/tables" "github.com/element-hq/dendrite/roomserver/types" + "github.com/lib/pq" ) const eventStateKeysSchema = ` diff --git a/roomserver/storage/postgres/event_types_table.go b/roomserver/storage/postgres/event_types_table.go index 32d2d4b1a..cd406c156 100644 --- a/roomserver/storage/postgres/event_types_table.go +++ b/roomserver/storage/postgres/event_types_table.go @@ -11,11 +11,11 @@ import ( "context" "database/sql" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/roomserver/storage/tables" "github.com/element-hq/dendrite/roomserver/types" + "github.com/lib/pq" ) const eventTypesSchema = ` diff --git a/roomserver/storage/postgres/events_table.go b/roomserver/storage/postgres/events_table.go index 70eefbe7b..03215f191 100644 --- a/roomserver/storage/postgres/events_table.go +++ b/roomserver/storage/postgres/events_table.go @@ -13,12 +13,12 @@ import ( "fmt" "sort" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/roomserver/storage/postgres/deltas" "github.com/element-hq/dendrite/roomserver/storage/tables" "github.com/element-hq/dendrite/roomserver/types" + "github.com/lib/pq" ) const eventsSchema = ` diff --git a/roomserver/storage/postgres/rooms_table.go b/roomserver/storage/postgres/rooms_table.go index f8a6efb23..4e040b9a7 100644 --- a/roomserver/storage/postgres/rooms_table.go +++ b/roomserver/storage/postgres/rooms_table.go @@ -11,11 +11,11 @@ import ( "context" "database/sql" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/roomserver/storage/tables" "github.com/element-hq/dendrite/roomserver/types" + "github.com/lib/pq" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/roomserver/storage/postgres/state_block_table.go b/roomserver/storage/postgres/state_block_table.go index e77d6e51d..27b728111 100644 --- a/roomserver/storage/postgres/state_block_table.go +++ b/roomserver/storage/postgres/state_block_table.go @@ -12,11 +12,11 @@ import ( "database/sql" "fmt" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/roomserver/storage/tables" "github.com/element-hq/dendrite/roomserver/types" + "github.com/lib/pq" "github.com/matrix-org/util" ) diff --git a/roomserver/storage/postgres/user_room_keys_table.go b/roomserver/storage/postgres/user_room_keys_table.go index 7ddbde760..29f6f856b 100644 --- a/roomserver/storage/postgres/user_room_keys_table.go +++ b/roomserver/storage/postgres/user_room_keys_table.go @@ -12,11 +12,11 @@ import ( "database/sql" "errors" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/roomserver/storage/tables" "github.com/element-hq/dendrite/roomserver/types" + "github.com/lib/pq" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha.go b/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha.go index da37a7fef..da9f1c221 100644 --- a/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha.go +++ b/roomserver/storage/sqlite3/deltas/20230516154000_drop_reference_sha.go @@ -11,8 +11,8 @@ import ( "database/sql" "fmt" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" + "github.com/lib/pq" "github.com/matrix-org/util" ) diff --git a/setup/base/base.go b/setup/base/base.go index 9b8f1f92f..359a6816b 100644 --- a/setup/base/base.go +++ b/setup/base/base.go @@ -28,10 +28,10 @@ import ( "github.com/matrix-org/gomatrixserverlib/fclient" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/gorilla/mux" - "github.com/kardianos/minwinsvc" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/httputil" + "github.com/gorilla/mux" + "github.com/kardianos/minwinsvc" "github.com/sirupsen/logrus" diff --git a/setup/mscs/msc2836/msc2836_test.go b/setup/mscs/msc2836/msc2836_test.go index 63bc2c181..5b85e6707 100644 --- a/setup/mscs/msc2836/msc2836_test.go +++ b/setup/mscs/msc2836/msc2836_test.go @@ -14,9 +14,9 @@ import ( "testing" "time" - "github.com/gorilla/mux" "github.com/element-hq/dendrite/setup/process" "github.com/element-hq/dendrite/syncapi/synctypes" + "github.com/gorilla/mux" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" diff --git a/syncapi/consumers/keychange.go b/syncapi/consumers/keychange.go index 51169d6ba..39f213060 100644 --- a/syncapi/consumers/keychange.go +++ b/syncapi/consumers/keychange.go @@ -10,7 +10,6 @@ import ( "context" "encoding/json" - "github.com/getsentry/sentry-go" roomserverAPI "github.com/element-hq/dendrite/roomserver/api" "github.com/element-hq/dendrite/setup/config" "github.com/element-hq/dendrite/setup/jetstream" @@ -20,6 +19,7 @@ import ( "github.com/element-hq/dendrite/syncapi/streams" "github.com/element-hq/dendrite/syncapi/types" "github.com/element-hq/dendrite/userapi/api" + "github.com/getsentry/sentry-go" "github.com/nats-io/nats.go" "github.com/sirupsen/logrus" ) diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go index 907c2b8a9..75afa1c96 100644 --- a/syncapi/consumers/roomserver.go +++ b/syncapi/consumers/roomserver.go @@ -14,7 +14,6 @@ import ( "errors" "fmt" - "github.com/getsentry/sentry-go" "github.com/element-hq/dendrite/internal/fulltext" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/roomserver/api" @@ -28,6 +27,7 @@ import ( "github.com/element-hq/dendrite/syncapi/streams" "github.com/element-hq/dendrite/syncapi/synctypes" "github.com/element-hq/dendrite/syncapi/types" + "github.com/getsentry/sentry-go" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/nats-io/nats.go" "github.com/sirupsen/logrus" diff --git a/syncapi/storage/postgres/account_data_table.go b/syncapi/storage/postgres/account_data_table.go index 51d12591b..e4b558fff 100644 --- a/syncapi/storage/postgres/account_data_table.go +++ b/syncapi/storage/postgres/account_data_table.go @@ -11,12 +11,12 @@ import ( "context" "database/sql" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/syncapi/storage/tables" "github.com/element-hq/dendrite/syncapi/synctypes" "github.com/element-hq/dendrite/syncapi/types" + "github.com/lib/pq" ) const accountDataSchema = ` diff --git a/syncapi/storage/postgres/current_room_state_table.go b/syncapi/storage/postgres/current_room_state_table.go index 506ebf0c0..2e75fefb8 100644 --- a/syncapi/storage/postgres/current_room_state_table.go +++ b/syncapi/storage/postgres/current_room_state_table.go @@ -13,7 +13,6 @@ import ( "encoding/json" "errors" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" rstypes "github.com/element-hq/dendrite/roomserver/types" @@ -21,6 +20,7 @@ import ( "github.com/element-hq/dendrite/syncapi/storage/tables" "github.com/element-hq/dendrite/syncapi/synctypes" "github.com/element-hq/dendrite/syncapi/types" + "github.com/lib/pq" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/syncapi/storage/postgres/output_room_events_table.go b/syncapi/storage/postgres/output_room_events_table.go index 03633f5c8..1ca426f60 100644 --- a/syncapi/storage/postgres/output_room_events_table.go +++ b/syncapi/storage/postgres/output_room_events_table.go @@ -14,7 +14,6 @@ import ( "fmt" "sort" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/roomserver/api" @@ -23,6 +22,7 @@ import ( "github.com/element-hq/dendrite/syncapi/storage/tables" "github.com/element-hq/dendrite/syncapi/synctypes" "github.com/element-hq/dendrite/syncapi/types" + "github.com/lib/pq" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/syncapi/storage/postgres/syncserver.go b/syncapi/storage/postgres/syncserver.go index e6f79f465..321b55b7f 100644 --- a/syncapi/storage/postgres/syncserver.go +++ b/syncapi/storage/postgres/syncserver.go @@ -12,11 +12,11 @@ import ( "database/sql" // Import the postgres database driver. - _ "github.com/lib/pq" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/setup/config" "github.com/element-hq/dendrite/syncapi/storage/postgres/deltas" "github.com/element-hq/dendrite/syncapi/storage/shared" + _ "github.com/lib/pq" ) // SyncServerDatasource represents a sync server datasource which manages diff --git a/syncapi/syncapi_test.go b/syncapi/syncapi_test.go index 9a9c9b9cd..4e1fa7dfb 100644 --- a/syncapi/syncapi_test.go +++ b/syncapi/syncapi_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "github.com/gorilla/mux" "github.com/element-hq/dendrite/internal/caching" "github.com/element-hq/dendrite/internal/httputil" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/setup/config" + "github.com/gorilla/mux" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib/spec" "github.com/nats-io/nats.go" diff --git a/userapi/storage/postgres/devices_table.go b/userapi/storage/postgres/devices_table.go index a12e4b173..b5feea07f 100644 --- a/userapi/storage/postgres/devices_table.go +++ b/userapi/storage/postgres/devices_table.go @@ -12,13 +12,13 @@ import ( "fmt" "time" - "github.com/lib/pq" "github.com/element-hq/dendrite/clientapi/userutil" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/userapi/api" "github.com/element-hq/dendrite/userapi/storage/postgres/deltas" "github.com/element-hq/dendrite/userapi/storage/tables" + "github.com/lib/pq" "github.com/matrix-org/gomatrixserverlib/spec" ) diff --git a/userapi/storage/postgres/one_time_keys_table.go b/userapi/storage/postgres/one_time_keys_table.go index 397cb7d66..dde63a17f 100644 --- a/userapi/storage/postgres/one_time_keys_table.go +++ b/userapi/storage/postgres/one_time_keys_table.go @@ -12,11 +12,11 @@ import ( "encoding/json" "time" - "github.com/lib/pq" "github.com/element-hq/dendrite/internal" "github.com/element-hq/dendrite/internal/sqlutil" "github.com/element-hq/dendrite/userapi/api" "github.com/element-hq/dendrite/userapi/storage/tables" + "github.com/lib/pq" ) var oneTimeKeysSchema = ` From 7cc7ebb46f1f06d08747199542a164f0400e0b5e Mon Sep 17 00:00:00 2001 From: Till Faelligen <2353100+S7evinK@users.noreply.github.com> Date: Thu, 14 Nov 2024 17:02:10 +0100 Subject: [PATCH 13/13] Update GHCR_NAME space to element-hq --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c795cd366..0e10af3fb 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -14,7 +14,7 @@ on: env: DOCKER_NAMESPACE: matrixdotorg DOCKER_HUB_USER: dendritegithub - GHCR_NAMESPACE: matrix-org + GHCR_NAMESPACE: element-hq PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7 jobs: