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 8e159152..38b0ab27 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 d94a483e..99e76ba8 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 b07b24fc..08aef515 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 7f33e17f..1783db9f 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 4298c2ae..589f84a3 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 6acc93c7..25059552 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 0cc7e47e..3b70bbbc 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 17fea6cc..a0270c37 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 8718c71f..1f53fba8 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 f16d1d76..4bfeb7ac 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 a89ebfcd..c54a872e 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 2793026b..1cfd0d89 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 28ff593f..ccda80e9 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 8fae45b8..6740cbbb 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 d5766fcc..7388a5eb 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 ad5312db..7ce12250 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 29468c16..00709719 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 ebafbe6a..ff41c025 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 58a27e59..fe7aecbc 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 dd4a9cbb..44d61bd9 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 a2c2a719..41cb500e 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 eb631481..7e18662a 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 fb7def02..7d94244e 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 9831450c..e80c32bf 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 aee16eb0..cbbe7c1b 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 d9f44232..7ec931e8 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 a952d177..f6ac7caa 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 905ecce4..82b6b6be 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 81afc3b1..9cdb8c18 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 7d753656..2ca26fb9 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 2d6b72d3..be9284fe 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 f8d3684f..37e43105 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 38e5bd46..d037fd00 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 47e3ba1c..d41f4411 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 6f2de353..4322305c 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 9466f583..97ce95b1 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 67146630..faf1feff 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 3fe0d8b4..531c1b7a 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 43331b42..a4714825 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 7f8bd9f4..b7602eac 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 6bf7c58e..982e199e 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 871b8b08..a6d0b639 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 7e8c066e..674944c9 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 0f55c881..ca8ace55 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 d06bac78..99766096 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 9e41a379..d37bb1ad 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 84be498d..fca712c8 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 4b9043fa..aa86f19c 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 8dfba8af..45022b67 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 772dc847..5bdc9eba 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 5aa6d8dd..93c82936 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 9959144c..3d95884e 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 ed59129c..6cb89e3e 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 1d7e3556..df333b2e 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 f331a73c..e41ac86c 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 5235e909..4ea3b4eb 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 7fa740e7..7b6474b7 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 4dc6498d..c088859d 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 cf9d43dd..ae7ca328 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 5a5296bf..f30bc3ba 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 e82c8861..600fb279 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 44e82aed..c71a3f4c 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 58d3053e..11f36cd4 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 979bced3..1d2a53f4 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 d4644b3e..a8209a45 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 18f9a0e9..6727972f 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 b805d4b5..a9406b85 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 5261a140..bd8667b5 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 03c0230e..49e4d06f 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 32cefde6..171b887f 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 14a08b79..641a4e20 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 a1d9d667..041f4749 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 365e9f86..15edbbed 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 ad94a49c..28a43e2e 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 26237142..aa8623b3 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 cdda0a88..b68d574a 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 77277868..72b4b3f6 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 be139c19..2d291e24 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 d8cd3133..4322eb3d 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 5d1417dd..f68868ce 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 ed85abd5..d7ecd0d1 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 9da54d5f..d6341446 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 d37362e2..7ebfb6f8 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 94360fce..87851c8d 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 18d1dd31..fdeaec81 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 637f24a4..82c6dea3 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 d9f44b5c..06303f0f 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 9c918fb6..98fcf45d 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 6ec9aaf5..2a784792 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 57282a00..60cc3c7f 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 079df328..261c0821 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 b02f131a..55d3e68d 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 aeaa2022..bf911c6d 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 3c230f62..cee02e1b 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 7ebecb65..386d60a2 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 5234b750..f8b3dc53 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 d4c8cf78..973550f6 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 92cfab49..3f2bc853 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 72fed656..47d70f00 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 f82d6d53..0b20ad04 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 8f889c41..41186845 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 6210bddb..03c4eee3 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 dd100bc0..06077d31 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 1407a88b..99f46371 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 f1dcb117..90945a55 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 bb659b9c..5c0e46a3 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 91b28cdb..0c0a99c2 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 134f2174..dbe2d1ec 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 d3730c7c..e30802b3 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 47efb11d..57d15dd5 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 82f9b9db..7a1d45b4 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 ede56436..15448047 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 be43aaf1..aff9c87c 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 892c26a2..99273bbf 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 7d21a3bb..80dbe3b5 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 bc413883..f5d70ae6 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 a54ff0d9..5e2fc52e 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 2be3ecdb..18cb42d6 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 f4659f52..2b3d2ddb 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 76fadaa9..f668fd77 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 ce7ad30f..6ab22ad4 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 38a88e4b..edd9038e 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 7c86ba69..89df7d80 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 b1cefe7b..1bd3b8f6 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 d28f319f..e70676d6 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 f5003b14..8c7d87b8 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 e8c7ff79..81f97caf 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 ba13e07f..ac42602c 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 dac9b1b3..c86e944f 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 fd0894d1..a7b40171 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 91718efd..cfab63b4 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 96669454..63c1cf3d 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 ff4f7bd0..b092746d 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 d1091057..d9aa9f9f 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 42ba8bfe..f614a0a6 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 906fc2b9..a96610d4 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 5388b4d2..74c7c4b6 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 d8d389d8..64a2c9f8 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 48b6d72e..97916e3e 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 fc894846..63040545 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 cf2d94b2..34b6258f 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 a6fffc0e..58bea7ca 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 2b0aebad..d507bffe 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 af98a0d4..4477355c 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 47aa82b4..e8946ead 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 bd2b10e6..acb8d53d 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 7c57ed0c..cf6520c3 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 f92e33d5..1d501646 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 a767ec41..fbc581ae 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 1a47816e..d1b1d5cc 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 fa58f1ea..8afc3a02 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 2caa7a05..53ebcddc 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 b347269c..e4d56853 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 8c73967c..f623e2ad 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 e8d1d373..2216c926 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 580cf1d8..751d3a5e 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 5fabfbf2..680def7f 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 f8de7f0c..b374b5c5 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 2c65c487..bc328ab0 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 fc894846..63040545 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 d8be4695..d0089a55 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 e58d5377..14d50189 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 41819431..0d662dbe 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 ad6d1b57..0d856c4c 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 d9b98fc4..06fa5e98 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 b6684e9b..ae476fd3 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 f500a631..aa04b365 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 33ae0613..851309a9 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 92075ff9..353f3975 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 232db32a..91394b76 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 65a854ce..eb6f3fa2 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 524bf1d5..3ec83a04 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 f926b62e..6232a2f2 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 e19a4564..5035ea3f 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 f8de42da..a9fef198 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 20f92e80..8362e1b5 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 bd6a5fc1..4744ba63 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 2cef32d3..a1928b40 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 16e54757..bf35b538 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 97ea9548..23eb3c2f 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 e3c80f1d..c17097a5 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 40d62fd6..d7b9c462 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 e43c0412..d1a0049d 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 d2807198..98329429 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 decb5ecc..e32a257e 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 12709900..782524c0 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 802ff818..cfba601b 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 034f19f1..5cf97785 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 de6ccf9b..c60c3eb6 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 d0687542..b6e175c6 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 f5f1c652..53d5d3ca 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 8fe98f20..150dee75 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 3f15063d..f4a22c8a 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 e1f0098a..baeebbc9 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 437da6c8..4554eeb4 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 735fb492..1042dbd0 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 81c055ed..38f7c364 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 767a586e..2defe48c 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 edeb7c45..bab7fa02 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 ef393fa5..86030a39 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 44910f4a..dd1b552a 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 4e062aed..537c0127 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 0663c2dc..3dcf1b72 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 8dd100d1..1489baa0 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 7ff6f504..479ade7b 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 c552550a..e11f79c8 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 c831565f..855ec35f 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 2e719dc8..f3e26b96 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 8b843e90..86f595d1 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 c3ac3cdc..f2b61a78 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 2867df60..c5edea21 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 5ac1d076..0ed0450c 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 cf3e7df5..3baa0022 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 0583dd01..018a369d 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 e2a2b25c..ea4ef328 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 85448552..67a5dcaf 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 bdd7f317..905d0261 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 625688cd..cd7e7735 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 086beb8e..0be1c2a6 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 259d55b7..9c3467a6 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 71ab7207..d543e463 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 47ee3792..905c5b22 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 2ff8039b..f018e549 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 58407ce8..b469d740 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 fa1acbf0..f8e68850 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 beae88c5..825fe1a9 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 e1c29e0f..04001491 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 83ff2890..ae00d123 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 603309cf..13e88fd2 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 79d600ab..5de23508 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 f97c5aa9..41431d1b 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 44022749..bceb42ed 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 9d67cdf9..2aa55666 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 2f3225b6..760eb1f1 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 1041d8e7..5b58db50 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 92476d6c..02391fb4 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 4a742ded..72673393 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 cac109e1..cb51a7ad 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 bc1722cd..5d9fb9ca 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 94ae4140..a1424c33 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 5873af76..04bcee0b 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 dd30c1b5..8ed2fe4e 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 fc1f12e7..df63432e 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 a1af82aa..ac91edb9 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 30482ae9..3fced1c2 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 69df401e..29dd2504 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 4eccd002..d000df0c 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 7e732334..d57922fd 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 27f43a8d..278757f3 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 97af7eae..b60bf55e 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 d196eaf5..7d36e6a2 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 4950e623..0ff9908b 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 7fd20f11..f8b6b67f 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 6269d0b0..c7e6f31f 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 8947ad62..7cfb57a8 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 852b6420..1c5ff1aa 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 c4c019f9..c599ab3d 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. +// 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/wrapper.go b/roomserver/api/wrapper.go index 4979d18c..edaeca81 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 d5172dab..e605074f 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 5ceda7e0..04f68cf1 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 9da751b1..eef893a9 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 2a1c3ea4..29f4db2f 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 104ce94e..fe1e1b3d 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 657ca871..9d302ee7 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. +// 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/input/input_latest_events.go b/roomserver/internal/input/input_latest_events.go index e9856cc5..ab9a440d 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. +// 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/input/input_membership.go b/roomserver/internal/input/input_membership.go index 4cfc2cda..44d58dea 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 1b881723..eaed4c75 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 dafa5873..c609c655 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 093082f9..30180024 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 e970d9a8..29744990 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 7fbec371..78aefce8 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 86563e8c..cda10799 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 23988e46..79aa4e14 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 5bea0044..738223fa 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 88fa2a43..d124c9c3 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 297a4a18..baf1da87 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 1ea8079d..55b6437e 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 9d7c7b56..63283b8b 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 886d0049..74a8c739 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 3fc61319..ab57e5c4 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 296960b2..a1cfd464 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 894e6d81..bec92bb2 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 07c5d656..da45aa71 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 dfd439a2..6f236868 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. +// 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 state diff --git a/roomserver/state/state_test.go b/roomserver/state/state_test.go index c5705678..27197576 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. +// 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 state diff --git a/roomserver/storage/interface.go b/roomserver/storage/interface.go index ab105e6f..5cbca3a5 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 61d4dba8..a28e89b5 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 355c49b1..eb7b27ab 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 687ee902..59b1a8d4 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 add66446..d6d7562d 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 1b1dd44d..5951846f 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 5f069ca1..92ca30bb 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 338e11b8..4ac3ff82 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 15ab7fd8..d9b41b3b 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 180a03cd..7bd1f8f3 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 009fd1ac..8f2a0f5f 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 1a96e352..ebb12e0e 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 ceb5e26b..34dfe441 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 eca81d81..39ca89a7 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 9ca8d034..8e15cd85 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 6e2f6712..e01b53ee 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 c46f47b3..956141e1 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 a84929f6..ebac3c62 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 4de6dee4..62d0bb82 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 5af48f03..3845d416 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 32ed06a1..9ec86ead 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 1068230f..333067fc 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 f8befc46..b223540c 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 65ceec1c..ef7ec13b 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 4c002e33..5f261319 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 00978121..ff0cd354 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 410fb7cf..a2aeb7a6 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 515bccc3..2673d243 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 325951c7..51056715 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 a052d69e..83485d1f 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 c030fffe..15d15114 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 26401e45..ad30e277 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 b678d8ad..73105dda 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 1012c074..fecbd2b9 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 4e59fbba..1bb7fbd0 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 34666552..7d712f30 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 cb21515b..f0967a44 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 db6f57a1..faf586c3 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 b72cb068..70029d57 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 815b42a2..7f6ea6ed 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 5034b242..cd1af3b8 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 ae8181cf..f9f09f64 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 dcac0b07..4eba014a 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 191c0722..7b117caa 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 ef3b8fe2..c9189b7a 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 c3689f51..ac7be9af 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 817f9304..78b18040 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 78399982..dd1694b0 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 fbff2cda..39340c5b 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 e8bd890a..0518f580 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 26615fc0..2c6704bd 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 41396ae3..cd785f4b 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 a95cec04..29d43ac7 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 ba7b7808..00fa9b82 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 eeefb425..b87b1c48 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 869caa28..724b4b00 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 72750354..c73b0295 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 15811710..05a129d1 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 7a942cf7..777be49c 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 76b44713..8eaa9d26 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 5faaefb8..83ba4f4f 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 c7c0866b..8615dbab 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 69571f90..709d9beb 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 abf88882..81cdc1ab 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 7f387dc0..0a56562f 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 67a26239..91056f1c 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 3c73dc1f..a856dc6b 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 48475327..abf9cf36 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 24ffcc04..4ad6dd6c 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 07b80b16..f57b781e 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 f86301a0..c5c47be5 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 bcd69fad..2daf6423 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 bb0dbb9c..411473d3 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 eab1b0b2..5b481175 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 b136c69a..025982ff 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 c4eecbdb..24ab9eba 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 d0227f4e..878853d8 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 9cc937d8..6e97bcfe 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 7ea01c7d..8a75d461 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 935ba83b..1ceb40cf 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 78188d1b..207a7ecd 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 4a8be9f4..df5ee4e9 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 97c781b9..88d69d56 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 44d735bb..eab1e2d5 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 c20d860a..a205c561 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 ec0b27ad..7af67f3a 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 6303c947..acbd84a2 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 77b083ae..444d1d1f 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 37660ee9..4ac179d0 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 5a0ec505..6e0bf81a 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 089382b8..42dbc544 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 39ef1108..4fbc9915 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 a511c747..b981aaad 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 1f46cd09..3e4ee43b 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 e5208b89..94c319ea 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 7edfd54a..b98cb426 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 b2d19111..4c07c028 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 2158d99e..64c085ba 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 1120dce0..462f48ea 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 53acecce..1daed8f9 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 9ab8eece..a1ae0d3d 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 5a76e9c3..406b5f64 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 88b86ef7..4cd5039e 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 2105bcae..5596986c 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 923ead9b..86998b66 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 132bd80c..a5231f00 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 2d8cf2ed..d97e6c47 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 f430fcc0..b0872ee6 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 f476335d..f34fdf65 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 34cae224..4a24d4d3 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 f7ce6531..4f1f7123 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 8da4f299..56aef4bb 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 bff5780b..08376f25 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 e50b5cbf..57ae3884 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 9e50422e..50b55801 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 af2b2c07..02068f8d 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 c7b11d3e..4872951f 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 c00fb7a7..439961f1 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 d8998e2b..61557f40 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 40b57e75..e1f6be44 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 b973903b..61e203e4 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 7cbb5408..8ba69223 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 998a063c..5f3d96ab 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 e1372f10..c52c7222 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 e05f9d91..719659a3 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 db0b173b..cc1246cc 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 45117d6d..65db4911 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 32424066..be228b8e 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 61734233..76ac216b 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 494be05f..3c09966c 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 0418ffc0..465f60bf 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 fe4f6c07..0c297688 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 662f9ea4..68bbaff1 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 8998d443..1b3e1048 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 a9c5e3a4..1bb8abea 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 26faf7c0..6c6e99a4 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 d2f405d4..20ecddc3 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 197f80e1..04c2d1a5 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 ed9c3484..6782eab5 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 05f7317c..429d2e49 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 76034143..a4042f7b 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 eecc23fe..16e93b56 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 da09de7c..988adc88 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 00c740db..8a0917d9 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 a21cfe80..28bbd084 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 9509b95a..273d9043 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 d4daec82..42f0c8c9 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 e2207bb5..a4200bdb 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 ba72ff35..ebb567bc 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 b3ccb573..dd22a937 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 9de86634..781089ce 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 3b211db5..c141b7bf 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 be05841c..6e0a7110 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 b4063516..9b4cf6a7 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 7d357c95..ae2c2539 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 1c60d2eb..177bd961 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 a2f1869d..8affd47c 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 81127481..10e06b5f 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 fd73bf62..73ca3783 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 da6cea31..79b7cf80 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 125b3158..b0796fba 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 6ffda340..f4e624f9 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 5b38c5f4..fc81edd1 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 deb35571..6a09bdcf 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 cba015e1..0b9bf8e2 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 0cfe9e79..8bb726a5 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 1a3d4fee..fee0d8c9 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 a9203857..b6950ce9 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 0335f826..6e88546a 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 59944a12..3cbc86cc 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 67c5e548..90ff9861 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 de3a9e9c..1fbc3966 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 44c6ca4a..cacfcb37 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 acb9e42b..a7c1a642 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 a00f4d6f..bfd91c54 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 e4f55ed9..8a7163fb 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 2e88aa8e..64ab5679 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 e2086dc9..f27a3b3c 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 a7949e4b..99787c07 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 b4edc80a..2754329d 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 fc46061d..eec7af88 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 b7acb203..f90ca8e4 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 240647b3..9100585f 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 d01915a7..51ee8d06 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 6c4ee762..1ec7c42d 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 65b9ff1a..01b4bbe7 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 bf400a00..6246c67a 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 cd0f19df..22872cad 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 d4e38dea..35113500 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 15e69cc4..f2114a11 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 5ce285c8..d0c6f8d8 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 1cdaca18..4a2092a9 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 37bc13ed..179dc1f9 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 7a4898cf..39823594 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 2abdcb95..b0e8b5c9 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 94d6c729..e2d44e52 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 2a5b1280..f160e778 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 7285110b..ea6649c0 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 e09f9c78..3c79d289 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 5302899f..3eb9f9cb 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 71d80d4d..deb73bd3 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 fc13dde5..60440670 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 a83f8042..d6af17fa 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 701383fc..c99b7476 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 cbadd98e..d555054c 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 3a0be73e..61a24178 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 b74e32ad..99a00a31 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 2c918847..7bc59225 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 a1c9b94a..c25b5bbd 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 45762a7d..495bd6aa 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 4bf9a5d8..f04b93d3 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 22ef12aa..c711c897 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 a182e4e6..0e3af961 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 0b3f8d01..2e9def2e 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 | 784 +++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 634 insertions(+), 150 deletions(-) diff --git a/LICENSE b/LICENSE index f433b1a5..be3f7b28 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/ + 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. - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + Preamble - 1. Definitions. + 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. - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. + 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. - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. + 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. - "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. + 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. - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. + 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. - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. + 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. - "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. + 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. - "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). + The precise terms and conditions for copying, distribution and +modification follow. - "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. + TERMS AND CONDITIONS - "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." + 0. Definitions. - "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. + "This License" refers to version 3 of the GNU Affero General Public License. - 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. + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. - 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. + "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. - 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: + 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) You must give any other recipients of the Work or - Derivative Works a copy of this License; and + A "covered work" means either the unmodified Program or a work based +on the Program. - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and + 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. - (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 + 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. - (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. + 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. - 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. + 1. Source Code. - 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. + 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. - 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. + 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. - 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. + 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. - 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. + 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. - 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. + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. - END OF TERMS AND CONDITIONS + 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 bf806921..a703529d 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 | 76 ++++++++++------------ 17 files changed, 35 insertions(+), 204 deletions(-) diff --git a/clientapi/auth/authtypes/flow.go b/clientapi/auth/authtypes/flow.go index 7388a5eb..3dc1bba6 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 f6ac7caa..4eb7fb05 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 11f36cd4..3b6a65f5 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 1d2a53f4..09d9c048 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 041f4749..80f58e87 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 aa8623b3..e271936a 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 b68d574a..743280ff 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 5e2fc52e..ec1c4253 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 18cb42d6..df81b53e 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 89df7d80..76a5564b 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 1bd3b8f6..aa4fa0f3 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 d9aa9f9f..d24df092 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 479ade7b..3796b5f8 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 e11f79c8..cc12c78f 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 e605074f..5971185c 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 8a0917d9..f73326e0 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 fce5753c..24d8d7fb 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'); +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") +(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()); }); - // 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 a703529d..15ec7eda 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 | 26 +++++------ 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 | 16 +++---- 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 | 26 +++++------ .../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 | 34 +++++++------- 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 | 14 +++--- 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, 2503 insertions(+), 2503 deletions(-) diff --git a/appservice/api/query.go b/appservice/api/query.go index 38b0ab27..3b942e9f 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 99e76ba8..4d3186e5 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 aa2af9f2..b7cd8856 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 08aef515..698382d0 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 1783db9f..01c1ce73 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 b2adeb75..d3c5bcee 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 6740cbbb..c1225a91 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 fe7aecbc..051668f2 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 44d61bd9..28291dcb 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 41cb500e..f304a09e 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 7e18662a..7b2e79c4 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 7d94244e..b7960a50 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 e80c32bf..44d213b7 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 4003e964..bdafd045 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 cbbe7c1b..54c53d40 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 c550b208..ad2d4ad4 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 82b6b6be..9451e5b2 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 9cdb8c18..d222187a 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 73a0afc3..2c8f3160 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 2ca26fb9..20e0f5d7 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 be9284fe..808bb559 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 37e43105..e43a3d85 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 afeca051..f2ae8168 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 d037fd00..aef41d31 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 d41f4411..a1d3c383 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 c151c130..6b408506 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 4322305c..6383b621 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 97ce95b1..27bd8e9f 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 faf1feff..e6ec2642 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 531c1b7a..030766d3 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 a4714825..ffa05b65 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 bd854efa..9e2dd0c5 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 b7602eac..c2460d4a 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 982e199e..69d8a3d9 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 a6d0b639..11e901de 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 674944c9..b39814ba 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 ca8ace55..8e4dfc5b 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 3f893449..b987e6f2 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 99766096..a29d9d8f 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 d37bb1ad..a46f6d6b 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 fca712c8..90ca86e3 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 aa86f19c..82b49920 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 45022b67..774cf0a8 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 24c52b06..59d9594d 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 5bdc9eba..71232b35 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 93c82936..bb2ae735 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 3d95884e..ab770866 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 6cb89e3e..ea1b5f60 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 43c034f9..8bc78e02 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 df333b2e..d03f43e7 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 e41ac86c..c354ef37 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 4ea3b4eb..63e310f7 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 f384b604..e5d6dbee 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 7b6474b7..2d793049 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 c088859d..3e48edbb 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 ae7ca328..2eef5347 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 f30bc3ba..110f86d1 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 600fb279..f4a641b9 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" + "github.com/element-hq/dendrite/setup/base" + userapi "github.com/element-hq/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" + 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 c71a3f4c..00c6c036 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 00d19154..efa37643 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 3b6a65f5..8ff7b75c 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 09d9c048..4f26f805 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 a8209a45..91e64c95 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" + "github.com/element-hq/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" + 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 6727972f..21fa0847 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 93b04372..c2ad23b0 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 a9406b85..20ce2056 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 bd8667b5..2f429752 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 49e4d06f..51d611a9 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 171b887f..f7d56820 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 641a4e20..c603d264 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 80f58e87..57e702b6 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 15edbbed..6d875eef 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 28a43e2e..16ee9370 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 e271936a..d931cd43 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 743280ff..757c9c1f 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 72b4b3f6..4d9dcddf 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 f68868ce..298e5881 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 fdeaec81..e31d17e4 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 82c6dea3..ddd439ef 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 06303f0f..26f2eab2 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 98fcf45d..49d95a68 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 2a784792..27d45038 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 60cc3c7f..c594b5ae 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 261c0821..af62bfe5 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 55d3e68d..617fdf07 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 e1dc0f66..54aedb44 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 386d60a2..1a48744b 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 871a605d..8e124355 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 f8b3dc53..504e90b7 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 2379ce2b..c6399ec5 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 973550f6..222faeaa 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 d6db7243..fd98c0d4 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 3f2bc853..7ca1500e 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 47d70f00..f0560131 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 0b20ad04..8a078ba4 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 41186845..6df50cb0 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 efe0547d..0a405543 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 03c4eee3..e7623eaf 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 06077d31..964b111c 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 99f46371..83cfa0dd 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 90945a55..9935f662 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 0c0a99c2..3e018fc7 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 dbe2d1ec..94ff165d 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 e30802b3..88b9bc17 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 9dda389e..4d5b2b68 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 79f4b3f2..3d4faad5 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 67388a10..809cf204 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 57d15dd5..d3e8f172 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 0200cf69..8797d5d1 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 7a1d45b4..b5c278b3 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 21e77c48..22b1eb44 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 15448047..08e67697 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 aff9c87c..9e069a6a 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 99273bbf..a2364586 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 80dbe3b5..54be0317 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 f5d70ae6..ae6524b0 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 ec1c4253..4473d8c4 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 df81b53e..2a7fe5e3 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 2b3d2ddb..b416384a 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 f668fd77..d35e8ac0 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 6ab22ad4..fc1555cd 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 edd9038e..36a18e90 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 76a5564b..679c2306 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 aa4fa0f3..b92941d0 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 e70676d6..1cd8fd37 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 8c7d87b8..214f5c5a 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 81f97caf..ca2e682b 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 ac42602c..df8b2470 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 213d1631..ed204be1 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 c86e944f..c528d6b6 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 a7b40171..8124bb33 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 cfab63b4..9481f095 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 63c1cf3d..4bd2db00 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 b092746d..8e71753a 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 d24df092..5d9cef9b 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 f614a0a6..269c9a7b 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 a96610d4..e6857697 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 750c57fd..92aa9291 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 4376a905..aeab42fb 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 d63c889d..6bba85fa 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 74c7c4b6..c7e5c06a 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 64a2c9f8..052d2034 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 97916e3e..bf131392 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 58bea7ca..45484e56 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 d507bffe..be27aba8 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 4477355c..e4f8a870 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 e8946ead..ca8fae5c 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 acb8d53d..47b2dd92 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 cf6520c3..394899ee 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 1d501646..c9e6bc4c 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 fbc581ae..4d321620 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 d1b1d5cc..47b69db9 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 8afc3a02..b342c6f5 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 53ebcddc..2145932f 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 f623e2ad..271f99fb 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 2216c926..c764f00d 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 680def7f..f2729469 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 b374b5c5..962c1fcd 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 bc328ab0..b35fa0f6 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 14d50189..56957a56 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 0d662dbe..6588667c 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 0d856c4c..2c298058 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 06fa5e98..cf2e21aa 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 ae476fd3..18a87864 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 aa04b365..0979c95c 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 851309a9..a84e740d 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 353f3975..667a4de8 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 91394b76..98eb27a4 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 eb6f3fa2..1bc7ce27 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 3ec83a04..e7f9490b 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 6232a2f2..27d7f342 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 db71f2c1..416e7e12 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 5035ea3f..dad6d82b 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 e5d898b3..36f9ad4b 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 a9fef198..d94344d0 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 a460af09..d7fb0767 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 6a14e3f1..71013e07 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 e79a086b..322169bd 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 4add5ae1..f17c1a8b 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 51e2499d..f70c56e4 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 fc1f5496..4af8cbc6 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 390334da..8bc5add2 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 e8bbe208..371683d1 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 fa0781ef..229124fa 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 a1928b40..661c0907 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 bf35b538..4a9fd1c9 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 23eb3c2f..be9515d2 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 d7b9c462..a1dcfc40 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 d1a0049d..203ff2bc 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 98329429..fddf3a9a 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 e32a257e..b9be15a4 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 782524c0..2eadf126 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 5cf97785..b48b2b22 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 0b040d7f..e0870dce 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 150dee75..4954b05b 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 f4a22c8a..9e66e4f8 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 baeebbc9..7a96594e 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 d5671be3..43ee5f8b 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 4554eeb4..afbbf8b4 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 5086684b..0195b7ad 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 1042dbd0..b9fb9bf5 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 30aa6790..68c56573 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 b2d0d218..00ea117b 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 dd1b552a..b9587108 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 3dcf1b72..b4f0ef12 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 1489baa0..84dd9d8d 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 855ec35f..4b0667f2 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 1019102d..5ddb1b29 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 e5ff5af8..6e5a5f94 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 f3e26b96..6d1dfd6d 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 86f595d1..ff175df8 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 f2b61a78..a73d383e 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 9654b747..4a91ad50 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 c5edea21..ed638dc3 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 0ed0450c..e3e5cb9e 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 d088950c..fb5c8f9e 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 3baa0022..72979b3c 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 018a369d..5eb3e109 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 ea4ef328..365c39bd 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 67a5dcaf..2f875b6f 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 905d0261..2bbe2add 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 cd7e7735..27b07995 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 0be1c2a6..ed75258d 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 9c3467a6..7b5bfc50 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 d543e463..1c7b8d3f 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 8cd29a54..b87f9f13 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 905c5b22..3a9369cf 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 f018e549..f57ef899 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 b469d740..216b283f 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 f8e68850..6ea70c5b 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 825fe1a9..b3c568bc 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 04001491..12c80b8e 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 13e88fd2..9deb5bbc 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 5de23508..e204380f 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 41431d1b..686bec3c 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 bceb42ed..3ac0cdfe 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 2aa55666..171661ba 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 760eb1f1..6d53e093 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 5b58db50..6a6cb004 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 02391fb4..5fe91c51 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 72673393..a5fed47c 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 cb51a7ad..6ae90c35 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 5d9fb9ca..07615687 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 a1424c33..f39c1738 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 04bcee0b..615cfbd1 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 8ed2fe4e..c89cde55 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 df63432e..1b5d0d21 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 ac91edb9..468d9f0c 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 3fced1c2..1d99975a 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 29dd2504..7cfd3636 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 d000df0c..75ed9757 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 d57922fd..f7992cf6 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 b60bf55e..f2c378e4 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 7d36e6a2..c3be2643 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 0ff9908b..199aecaa 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 f8b6b67f..5ae9c84a 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 b2b31924..9493995e 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 7cfb57a8..b687ed09 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 1c5ff1aa..f07c5953 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 d6caec08..e448dcfa 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 c599ab3d..1e82c85e 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 edaeca81..a08901eb 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 5971185c..bbcd0ab1 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 058361e6..e935adad 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 04f68cf1..abe2f3a8 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 a71fd2d1..98bdc7d6 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 eef893a9..0d0a2744 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 29f4db2f..66c9f3c1 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 b2e21bf5..8b3be0d7 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 1cef83df..02f2aa43 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 fe1e1b3d..053fdcaa 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 9d302ee7..bab5b72a 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 4ee6d211..05dc842e 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 ab9a440d..8a2973c5 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 44d58dea..26295e7d 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 21493287..fdc37eee 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 f435181a..a12f5ecb 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 eaed4c75..883d558f 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 c609c655..41f784ae 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 30180024..82696e86 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 29744990..4d14aa5c 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 78aefce8..f966b5b4 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 cda10799..fee865ad 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 79aa4e14..7f4ce7f4 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 738223fa..a39f80a6 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 d124c9c3..6a76a289 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 baf1da87..58453d27 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 55b6437e..99a9b8fa 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 63283b8b..707c49eb 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 74a8c739..98ff7d41 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/element-hq/dendrite/roomserver/storage/tables" + "github.com/element-hq/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/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 ab57e5c4..2df2042e 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 a1cfd464..d5748469 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 bec92bb2..be2adffa 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 da45aa71..757637d3 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 85312efd..48911d2b 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 6f236868..1d3cba27 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 27197576..774bb4c2 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 5cbca3a5..b560d7d3 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 eb7b27ab..504a0554 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 5951846f..e597be6a 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 c79daac5..7a5a029a 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 92ca30bb..d90a8a76 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 4ac3ff82..2b270815 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 d9b41b3b..e85e9e9b 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 7bd1f8f3..0b5c0c50 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 8f2a0f5f..2c5940ca 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 ebb12e0e..4a743d32 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 34dfe441..99018c3a 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 39ca89a7..490f0e9c 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 8e15cd85..49ac2df2 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 e01b53ee..fe8ad975 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 956141e1..448a9979 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 ebac3c62..db67a920 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 62d0bb82..327c445c 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 3845d416..bb9454a7 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 9ec86ead..178aba37 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 333067fc..85308e9c 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 b223540c..e8b158fc 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 a96e8707..62b72ca6 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 06284d2e..e580d9ab 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 7b04641b..a4eb0eb9 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 612e4ef0..c55aa48b 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 ff0cd354..d8a8c4eb 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 2673d243..85296239 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 547d9703..962757d2 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 51056715..68800bdf 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 83485d1f..a47ffca0 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 15d15114..323c0ca9 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 ad30e277..0090abb5 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 73105dda..5618d0cb 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 fecbd2b9..0b6a4f2a 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 1bb7fbd0..6f88d7b3 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 7d712f30..cff1afac 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 f0967a44..cef035bc 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 faf586c3..8415a027 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 70029d57..e0085ff4 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 7f6ea6ed..67e64523 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 cd1af3b8..414cd925 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 f9f09f64..5c37d691 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 4eba014a..6b2ec70a 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 7b117caa..f108d673 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 c9189b7a..f628300f 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 ac7be9af..490abd20 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 78b18040..cd428096 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 b490d0fe..610299f7 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 a856fe55..58e41ff4 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 92c57a91..c1a97c9f 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 52aeacc2..a9e61c8e 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 02f6992c..0c311c1e 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 8727e243..20707c5d 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 e3eedbf1..8bec1fcc 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 c4524ee4..8d785402 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 9d41e90b..6a70f1a6 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 e6289e9b..5615f371 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 ea48dc22..ce35de66 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 624d92ae..6ca778d4 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 e97e3e33..9db915cd 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 de0b420b..241cda43 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 c7c991b2..7d84c1b4 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 2809771b..bb0ba271 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 39340c5b..0256cdd9 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 2c6704bd..ee2e5cad 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 bba967b9..72f8b239 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 cd785f4b..1dd7cfc6 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 724b4b00..75d2332b 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 09048cc9..cc896f8e 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 c73b0295..1b8b35f1 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 05a129d1..8a9934b9 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 ecbab706..63bc2c18 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 696d0b0d..3fef7927 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 777be49c..a8f0a44a 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 8eaa9d26..bde8916f 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 83ba4f4f..c7b4c98b 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 8615dbab..ec00e96e 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 709d9beb..9167922a 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 81cdc1ab..8a54bd6b 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 0a56562f..94d4030f 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 91056f1c..f518852f 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 a856dc6b..b21dffb1 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 abf9cf36..7c5cb861 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 24515bbb..4046edc0 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 4ad6dd6c..9568d71c 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 56954cfa..5ffa7f3f 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 f57b781e..80faebaa 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 c5c47be5..0796093e 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 2daf6423..cbce183d 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 5b481175..5b441cb2 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 025982ff..796429bc 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 5c6682bd..79ec5ce3 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 24ab9eba..326c7ff4 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 878853d8..27befd54 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 6e97bcfe..c0a7eec2 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 8a75d461..34241cd0 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 1ceb40cf..48b05387 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 207a7ecd..32e5e99c 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 df5ee4e9..1c6734f9 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 a983bb7b..faf88c86 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 88d69d56..8db439e0 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 eab1e2d5..8ee464c8 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 a205c561..9a96186a 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 7af67f3a..c5d8d5f1 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 4ac179d0..7a67ef0f 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 42dbc544..61c1a08d 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 4fbc9915..ba0cc004 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 b981aaad..50c82286 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 3e4ee43b..2dbb6a8e 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 94c319ea..e4bcaad3 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 b98cb426..24b3daa7 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 4c07c028..357c3cb0 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 64c085ba..f8a6d0dd 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 462f48ea..242bae57 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 1daed8f9..48b66750 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 a1ae0d3d..94f6ef64 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 406b5f64..ae732756 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 4cd5039e..5d48ca62 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 5596986c..e6ce7254 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 86998b66..8fb0eca6 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 e5f734c9..486515f9 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 cd17fdc6..23f84200 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 4468a772..0b402519 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 a5231f00..dad41010 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 d97e6c47..c3f335a6 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 b0872ee6..fd12adb6 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 4f1f7123..3ffb5bfa 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 56aef4bb..dfb4d029 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 17a37a2d..50cdd537 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 08376f25..d08296bc 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 57ae3884..03a83aa4 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 50b55801..323bfa87 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 02068f8d..74804631 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 4872951f..36892cff 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 439961f1..7e91d76d 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 61557f40..95884eb1 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 e1f6be44..29a2685e 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 61e203e4..86f88d29 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 8ba69223..e4303881 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 5f3d96ab..3eddf84d 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 b51eccf5..f0a5aec3 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 c52c7222..9d12899a 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 719659a3..806a007f 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 ce7ca3fc..4b60b273 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 cc1246cc..a1629556 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 2df111a2..8f095222 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 65db4911..235ed95f 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 0a36f588..93489a04 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 9b755dc8..86758ea6 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 d8161836..9105b889 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 46270e36..b82cef14 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 7691cc5f..200d3214 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 51f2a3d3..e0721834 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 e8189c35..fc61b659 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 a3634c03..0f2f612f 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 66ee0ded..2c1eb4ed 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 790f5bd1..e55ff168 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 be228b8e..434c57bd 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 ed52dc5c..8a4f06b8 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 00b67cc4..6d20527c 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 15500a47..d0372021 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 8b12e2eb..fde6f436 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 f25bc978..b918b50f 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 f208d84e..3529c3f2 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 76ac216b..50fe2da8 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 3c09966c..0e066511 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 e083507e..e953bb93 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 465f60bf..aa4d2cad 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 d360e10d..9a9c9b9c 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" + 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/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" + "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 a0fcec0f..95e7040a 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 6c6e99a4..f30cb8a7 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 6c616ab0..15271fb4 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 04c2d1a5..474c573b 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 a4042f7b..d7cab139 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 988adc88..8881b047 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 28bbd084..9d67c50a 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 5f15cfb3..ad045974 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 273d9043..aeed8b52 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 42f0c8c9..5aa49681 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 ebb567bc..9172a8d2 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/element-hq/dendrite/internal/pushgateway" + "github.com/element-hq/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/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 dd22a937..c7e14098 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 fca74129..a79441f3 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 7b7c0861..79b1b8e7 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 781089ce..3bc52364 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 c141b7bf..824973c3 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 6e0a7110..be7ccd2f 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 9b4cf6a7..67dd6275 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 8affd47c..815f803c 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 10e06b5f..ff15f7e5 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 de2a6d2c..03d8e742 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 73ca3783..4344a17e 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 79b7cf80..2ff35222 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 165de899..cf55bda4 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 b0796fba..bc996f3f 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 f4e624f9..36b0745a 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 fc81edd1..6333deb7 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 6a09bdcf..56970cd9 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 0b9bf8e2..a46d092f 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 b6950ce9..fb37f381 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 6e88546a..a151270b 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 3cbc86cc..a575d984 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 90ff9861..ea52c837 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 1fbc3966..8d220f1d 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 cacfcb37..ba347b53 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 a7c1a642..75f8df03 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 bfd91c54..57fe5747 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 345877d1..bd5c329b 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 8a7163fb..b74f3970 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 64ab5679..91951359 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 3c3e3fdd..1c691e0e 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 f27a3b3c..4e8740fe 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 99787c07..195a7357 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 2754329d..035d9b51 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 eec7af88..5ddfdf7f 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 f90ca8e4..66681f9c 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 9100585f..50051a29 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 51ee8d06..e33129b6 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 01b4bbe7..3bad0fae 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 6246c67a..19031962 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 f2114a11..05710e5d 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 d0c6f8d8..03f0d959 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 4a2092a9..9a9d8c51 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 179dc1f9..c50b8167 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 39823594..71f54061 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 b0e8b5c9..e8f7545d 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 e2d44e52..e80f07b5 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 f160e778..0823ab0b 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 def0074d..86369456 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 ea6649c0..4c453d2b 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 3c79d289..f5e08053 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 89795473..302eafbd 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 3eb9f9cb..c6c26522 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 deb73bd3..b7262fae 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 60440670..b827d895 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 d6af17fa..e0723f8f 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 c99b7476..ceb2178e 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 5a789dfd..68198b37 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 d555054c..058d2c29 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 61a24178..76cafe25 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 09924eb0..a8a9368d 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 61fe0266..0c98c932 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 c25b5bbd..cddf3342 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 495bd6aa..6f3d801f 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 117da08e..a5d9cae1 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 45d37525..6d3eeaca 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 2ea978d6..2844ef63 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 f04b93d3..a913c072 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 191a35c0..7b52c185 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 084f683b..5f9714a5 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 d9c883da..9c7a1fdc 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 2bae96fe..8b53a899 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 6d4a9dce..48ae6a87 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 8616e120..0ee381f0 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 2ef9e6c2..a7ba979e 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 ed93fd79..7af68039 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 caab1e74..0d6f533c 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 2f681f3e..7f2c27e6 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 e113ca2d..3ae601ef 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 f3399972..85de694f 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 00fe4fdc..57de4ca5 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 624cc415..23069799 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 9613b504..6f4a9825 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 a5b03aa8..9973c90b 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 420d8bf1..eeb95ff9 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 36bcefd8..5f782c19 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 02cd1aa1..b5da4ca5 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 00000000..39041ce0 --- /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 15ec7eda..27e7b39a 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 3b942e9f..f148f4e6 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 4d3186e5..99eefd53 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 698382d0..862dde49 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 01c1ce73..1bf688e8 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 589f84a3..57e1f610 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 25059552..4f6235c5 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 3b70bbbc..48b92fe0 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 a0270c37..7e7bb1dd 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 1f53fba8..4cde4783 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 4bfeb7ac..99446d30 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 c54a872e..88bde39f 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 1cfd0d89..23e4108c 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 ccda80e9..5e3247f1 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 c1225a91..c32ed0fa 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 3dc1bba6..0f5d536a 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 7ce12250..cf21453e 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 00709719..9d162fb2 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 ff41c025..1d7653d6 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 051668f2..3502cdec 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 28291dcb..97424241 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 f304a09e..617348f7 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 7b2e79c4..c46680a4 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 b7960a50..aab94821 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 44d213b7..cc5fbfbe 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 54c53d40..dbf862ca 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 7ec931e8..8e22bbcb 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 4eb7fb05..8ceadcf0 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 9451e5b2..330a1685 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 d222187a..4fc19134 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 20e0f5d7..cd1a8d2f 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 808bb559..448df8a6 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 e43a3d85..713b0bab 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 aef41d31..157d2bd2 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 a1d3c383..dfc15173 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 6383b621..9b059469 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 27bd8e9f..ef8e3075 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 e6ec2642..9a30b85b 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 030766d3..88b65089 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 ffa05b65..30cb3233 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 c2460d4a..69619cff 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 69d8a3d9..e6f093b5 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 11e901de..0a8b4e68 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 b39814ba..753e7322 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 8e4dfc5b..442719a1 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 a29d9d8f..74f6b28d 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 a46f6d6b..c2b26d08 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 90ca86e3..6c6e3d89 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 82b49920..ebc8f814 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 774cf0a8..4ff40b43 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 71232b35..9b6699b0 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 bb2ae735..55282c3f 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 ab770866..b75d38a6 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 ea1b5f60..39646393 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 d03f43e7..403949eb 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 c354ef37..795b311b 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 63e310f7..5544dccd 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 2d793049..71cc0ca6 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 3e48edbb..dbeb345f 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 2eef5347..c8f33550 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 110f86d1..191cf133 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 f4a641b9..d72638ee 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 00c6c036..a1a0300d 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 8ff7b75c..9068625f 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 4f26f805..5aa5c969 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 91e64c95..84615867 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 21fa0847..d702fd3b 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 20ce2056..83d491d9 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 2f429752..2fee21b9 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 51d611a9..d71cdeaf 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 f7d56820..c46fc5a2 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 c603d264..24f68029 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 57e702b6..2b0bf52a 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 6d875eef..f32b7848 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 16ee9370..3cf69c34 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 d931cd43..c4a01383 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 757c9c1f..f6c34e5e 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 4d9dcddf..9e88f7d8 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 2d291e24..b747e051 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 4322eb3d..25c9c279 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 298e5881..8b21e5a8 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 d7ecd0d1..6330b0b3 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 d6341446..7fc46373 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 7ebfb6f8..ea2fe034 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 87851c8d..f43d6ae7 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 e31d17e4..b05b63c8 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 ddd439ef..de9e4153 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 26f2eab2..d8b5f1c8 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 49d95a68..d126aef6 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 27d45038..cc60ef88 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 c594b5ae..7a18c2ea 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 af62bfe5..9a7d40e5 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 617fdf07..8a0e3ee1 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 bf911c6d..523f6c57 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 cee02e1b..09683d5b 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 1a48744b..429700d8 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 504e90b7..1a1a9f4c 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 222faeaa..43c1eca1 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 7ca1500e..107bab88 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 f0560131..ab86afd6 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 8a078ba4..22d7c715 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 6df50cb0..7826759f 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 e7623eaf..10edea8e 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 964b111c..9f8bb8f2 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 83cfa0dd..f0267eba 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 9935f662..a0442ce9 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 5c0e46a3..1acaba03 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 3e018fc7..4f86b8cb 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 94ff165d..6727d28c 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 88b9bc17..075f673d 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 d3e8f172..87842a46 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 b5c278b3..424cf559 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 08e67697..b7192f80 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 9e069a6a..136ad509 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 a2364586..589faea0 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 54be0317..7a3ad079 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 ae6524b0..945975d6 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 4473d8c4..4c186dc6 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 2a7fe5e3..9738484e 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 b416384a..d68208a4 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 d35e8ac0..43f51586 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 fc1555cd..6b2c1a9b 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 36a18e90..10f26a12 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 679c2306..5e320681 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 b92941d0..fc0e9112 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 1cd8fd37..af3506b2 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 214f5c5a..580858d8 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 ca2e682b..f4826c18 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 df8b2470..f52d2e62 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 c528d6b6..7c906bb7 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 8124bb33..b9a7ab29 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 9481f095..3073a512 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 4bd2db00..07646278 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 8e71753a..b0dfda96 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 5d9cef9b..03dd8a0c 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 269c9a7b..4e3dfdd5 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 e6857697..b9e7e804 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 c7e5c06a..cba701f8 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 052d2034..6cc29391 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 bf131392..02bb8c98 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 63040545..7c247e0c 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 34b6258f..dfeb5479 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 45484e56..3fe988f4 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 be27aba8..08dbf744 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 e4f8a870..a2125913 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 ca8fae5c..20573f39 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 47b2dd92..02e1f1f8 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 394899ee..2767c520 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 c9e6bc4c..2b93bfdc 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 4d321620..46011334 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 47b69db9..7ca7ad35 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 b342c6f5..632dfd17 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 2145932f..4a5fc977 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 e4d56853..71613ba3 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 271f99fb..19b870b2 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 c764f00d..2dbed881 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 751d3a5e..630984f1 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 f2729469..93434e3b 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 962c1fcd..8dcd838e 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 b35fa0f6..60f421d7 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 63040545..7c247e0c 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 d0089a55..e4a04f60 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 56957a56..aa449c9a 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 6588667c..feba7428 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 2c298058..9972765d 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 cf2e21aa..2dba53e7 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 18a87864..b0a442b4 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 0979c95c..331db83c 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 a84e740d..ddf009fa 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 667a4de8..9eb67077 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 98eb27a4..ee83167d 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 1bc7ce27..310c12ed 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 e7f9490b..c0a06d12 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 27d7f342..abe4addb 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 dad6d82b..9f630f37 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 d94344d0..2173a93f 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 8362e1b5..2dd70316 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 4744ba63..44bc3c7b 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 661c0907..98caba2f 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 4a9fd1c9..28b67cab 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 be9515d2..12b60ba9 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 c17097a5..1a3222f8 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 a1dcfc40..852caab2 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 203ff2bc..d9719341 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 fddf3a9a..de58e476 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 b9be15a4..c71bbce8 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 2eadf126..5f16bd9e 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 cfba601b..25a8520c 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 b48b2b22..d3255767 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 c60c3eb6..23797a5e 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 b6e175c6..663d0e98 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 53d5d3ca..5c378c66 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 4954b05b..35c35bd1 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 9e66e4f8..1cb54da1 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 7a96594e..a23d69a6 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 afbbf8b4..330d2215 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 b9fb9bf5..33b3f24d 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 38f7c364..6b47980d 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 2defe48c..1730c447 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 bab7fa02..0de0db6b 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 86030a39..391c78be 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 b9587108..c59ddc63 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 537c0127..923c4673 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 b4f0ef12..26f2bcab 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 84dd9d8d..4049e47e 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 3796b5f8..420f5327 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 cc12c78f..69466354 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 4b0667f2..24c8fcf0 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 6d1dfd6d..0f489418 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 ff175df8..ac20c886 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 a73d383e..3a7e7fc9 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 ed638dc3..006a54b9 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 e3e5cb9e..6d1680a9 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 72979b3c..e4a808e5 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 5eb3e109..64936b3d 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 365c39bd..87067568 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 2f875b6f..41651658 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 2bbe2add..ef8335b7 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 27b07995..cca6773b 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 ed75258d..46745072 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 7b5bfc50..2d255f79 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 1c7b8d3f..0805b930 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 3a9369cf..b397a5e4 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 f57ef899..b5242e7e 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 216b283f..31f616da 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 6ea70c5b..e2c297b5 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 b3c568bc..f4a36606 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 12c80b8e..1a1e348e 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 ae00d123..e3aaa46c 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 9deb5bbc..ea5903dd 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 e204380f..d24831e2 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 686bec3c..545abb94 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 3ac0cdfe..dc4df4c9 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 171661ba..e4e8b25d 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 6d53e093..066b1b9c 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 6a6cb004..48a96b0c 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 5fe91c51..4d810a62 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 a5fed47c..96342cd8 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 6ae90c35..9d046e12 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 07615687..269a1430 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 f39c1738..5b7a2333 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 615cfbd1..c8e63465 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 c89cde55..bef7482b 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 1b5d0d21..456158ca 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 468d9f0c..3a8418ac 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 1d99975a..1cd82251 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 7cfd3636..a4d1883a 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 75ed9757..0a2b63f4 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 f7992cf6..86ba972a 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 278757f3..41b4cccc 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 f2c378e4..e3951a4f 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 c3be2643..8c94d554 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 199aecaa..201f36df 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 5ae9c84a..16f3887d 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 c7e6f31f..7efe4092 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 b687ed09..748e3ac7 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 f07c5953..4a554fee 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 1e82c85e..2d784048 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 a08901eb..7023e2c2 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 bbcd0ab1..cf145619 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 abe2f3a8..b66cd09a 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 0d0a2744..e854d1be 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 66c9f3c1..3b5704a3 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 053fdcaa..46cd206a 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 bab5b72a..b84db345 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 8a2973c5..47ec1d5e 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 26295e7d..29542862 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 883d558f..da8c92a6 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 41f784ae..8ad255c2 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 82696e86..d5ddb5cd 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 4d14aa5c..d3c30a6a 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 f966b5b4..16fa7fcc 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 fee865ad..f609e6ae 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 7f4ce7f4..c58d48ff 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 a39f80a6..88da777b 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 6a76a289..d15a90ac 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 58453d27..be5e591a 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 99a9b8fa..db17937a 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 707c49eb..cf18924e 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 98ff7d41..e5ee8f83 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 2df2042e..2e233aea 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 d5748469..129bb479 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 be2adffa..ce258dcc 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 757637d3..819102bd 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 1d3cba27..9a7669a4 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 774bb4c2..3f38fbf0 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 b560d7d3..49086dba 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 a28e89b5..560767b3 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 504a0554..c6bb1863 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 59b1a8d4..4213e961 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 d6d7562d..ef0c5bf3 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 e597be6a..045d7ab6 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 d90a8a76..a8f5c67a 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 2b270815..624ccd79 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 e85e9e9b..32d2d4b1 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 0b5c0c50..70eefbe7 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 2c5940ca..a626cb4e 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 4a743d32..90babcbf 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 99018c3a..c57c979c 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 490f0e9c..91d309ec 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 49ac2df2..9f7f0075 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 fe8ad975..4e99bda4 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 448a9979..bf59767c 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 db67a920..5e97fe28 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 327c445c..f8a6efb2 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 bb9454a7..e77d6e51 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 178aba37..0fd1be9f 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 85308e9c..9c9a5777 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 e8b158fc..7ddbde76 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 ef7ec13b..c99ff0ce 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 5f261319..291313a5 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 d8a8c4eb..4662e07e 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 a2aeb7a6..6d1a2fb0 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 85296239..da37a7fe 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 68800bdf..753f49e3 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 a47ffca0..21fdb015 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 323c0ca9..db2e6d5a 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 0090abb5..a3481f1e 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 5618d0cb..b2857df8 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 0b6a4f2a..3eae1474 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 6f88d7b3..3698f71b 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 cff1afac..3711b6e3 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 cef035bc..862f9aa9 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 8415a027..902babc0 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 e0085ff4..215704d2 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 67e64523..3aa419ea 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 414cd925..93a9bb8f 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 5c37d691..bbe2fc3f 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 6b2ec70a..13dcc55c 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 f108d673..144f2ac0 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 f628300f..7b38491d 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 490abd20..8cdf9279 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 cd428096..e8f4991b 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 dd1694b0..89825171 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 0256cdd9..759066bc 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 0518f580..5d7b7215 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 ee2e5cad..9b8f1f92 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 1dd7cfc6..2ed30a42 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 29d43ac7..0385fb12 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 00fa9b82..0ac36847 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 b87b1c48..263aa9f3 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 75d2332b..b8c20224 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 1b8b35f1..36d6794d 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 8a9934b9..4322e8a2 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 a8f0a44a..fc360b5d 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 bde8916f..e6f966b2 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 c7b4c98b..51169d6b 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 ec00e96e..a13919ac 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 9167922a..6278ddab 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 8a54bd6b..907c2b8a 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 94d4030f..98f57d22 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 f518852f..8940cd11 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 b21dffb1..89657be6 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 7c5cb861..d1d00b17 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 9568d71c..4e98188e 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 80faebaa..4c8fefd6 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 0796093e..87bafdc4 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 cbce183d..af88a8dd 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 411473d3..af304542 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 5b441cb2..cf7efe20 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 796429bc..3f5d6e3b 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 326c7ff4..469127d5 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 27befd54..eaa7cab2 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 c0a7eec2..9ce0a2ee 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 34241cd0..8d1434ab 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 48b05387..81f1ef45 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 32e5e99c..dcc78c85 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 1c6734f9..3024e44a 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 8db439e0..fec71eaa 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 8ee464c8..51d12591 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 9a96186a..cad5b1d1 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 c5d8d5f1..506ebf0c 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 acbd84a2..f216cacd 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 444d1d1f..ea25c700 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 7a67ef0f..28fb6832 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 6e0bf81a..80546250 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 61c1a08d..34233f34 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 ba0cc004..0d927133 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 50c82286..878f9be8 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 2dbb6a8e..db364f4c 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 e4bcaad3..e16a230d 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 24b3daa7..738c0420 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 357c3cb0..03633f5c 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 f8a6d0dd..c6537f75 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 242bae57..fb3ff37e 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 48b66750..f53a249d 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 94f6ef64..b5693c01 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 ae732756..c0bfd09a 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 5d48ca62..3f63189a 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 e6ce7254..e6f79f46 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 8fb0eca6..050b0987 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 dad41010..b98cf227 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 c3f335a6..2cdd63d8 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 fd12adb6..32ae2465 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 f34fdf65..cbf512df 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 4a24d4d3..d9e2958f 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 3ffb5bfa..0cfa010f 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 dfb4d029..f55595e0 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 d08296bc..fa40ab1b 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 03a83aa4..b311e80a 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 323bfa87..bbf5639c 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 74804631..9fd04d56 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 36892cff..b8542a1b 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 7e91d76d..9ef46c42 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 95884eb1..30a0980d 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 29a2685e..f1f90541 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 86f88d29..b1330d94 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 e4303881..e9048055 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 3eddf84d..d9622c52 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 9d12899a..bc6e29c0 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 806a007f..0c841804 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 a1629556..acfd32fb 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 235ed95f..cbe0f37b 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 434c57bd..2ede6ab4 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 50fe2da8..4b1c57c7 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 0e066511..3b80d487 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 aa4d2cad..2b1dc995 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 0c297688..640b03ea 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 68bbaff1..7b0699f7 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 1b3e1048..0ffd0443 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 1bb8abea..98f3b14d 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 f30cb8a7..de20a608 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 20ecddc3..6f117096 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 474c573b..e77bd9c3 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 6782eab5..a7e5ef13 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 429d2e49..7f160bb3 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 d7cab139..d84cb159 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 16e93b56..af9faf92 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 8881b047..51e56379 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 f73326e0..73beaa35 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 9d67c50a..6c275a3e 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 aeed8b52..67eea7cd 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 24d8d7fb..a3a0277a 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 5aa49681..6da12fc9 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 a4200bdb..b7ee9baa 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 9172a8d2..927996e6 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 c7e14098..7f7f593f 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 3bc52364..5f62b21d 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 824973c3..d3e4d357 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 be7ccd2f..fe5d9f7d 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 67dd6275..cea51b4d 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 ae2c2539..53c2a74b 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 177bd961..f6021a89 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 815f803c..8b450104 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 ff15f7e5..09ead2c5 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 4344a17e..666e75f9 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 2ff35222..b69340d9 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 bc996f3f..7767f6cd 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 36b0745a..251b3c3f 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 6333deb7..489017fb 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 56970cd9..a8566e69 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 a46d092f..5797b067 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 8bb726a5..68ae1e83 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 fee0d8c9..6bf6c7e7 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 fb37f381..02c141a2 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 a151270b..a12e4b17 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 a575d984..df25ea12 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 ea52c837..16520bad 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 8d220f1d..0d522b0b 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 ba347b53..8d98295b 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 75f8df03..3afc0436 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 57fe5747..397cb7d6 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 b74f3970..9508b571 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 91951359..ad94eba7 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 4e8740fe..9e859c8a 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 195a7357..b11ab591 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 035d9b51..696e1aa6 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 5ddfdf7f..499c5c1f 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 66681f9c..2b1885cd 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 50051a29..689437ba 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 e33129b6..66cc7c06 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 1ec7c42d..8ab34339 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 3bad0fae..dd8923d3 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 19031962..ea594bc4 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 22872cad..62dda5d7 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 35113500..4033da23 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 05710e5d..314ab757 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 03f0d959..d5d1fed3 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 9a9d8c51..a53850b3 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 c50b8167..8f022397 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 71f54061..19ac37c4 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 e8f7545d..e71fc16e 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 e80f07b5..500e3741 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 0823ab0b..0ef4639e 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 4c453d2b..47e98218 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 f5e08053..be76f30d 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 c6c26522..ab8a0f8e 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 b7262fae..319939bc 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 b827d895..c57cc153 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 e0723f8f..6a0ea787 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 ceb2178e..3536d88c 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 058d2c29..3a2afdf0 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 76cafe25..7d4cfbae 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 99a00a31..235cff78 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 7bc59225..971f3dc9 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 cddf3342..042e2fd9 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 6f3d801f..6e33ced0 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 a913c072..9d9b4696 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 c711c897..aa3f38d2 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 0e3af961..eb9cedaf 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 2e9def2e..b4f93967 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 47b85b3e..ad40f689 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 4f6235c5..5b3ba729 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 4cde4783..1b55864e 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 2b227d37..335028c8 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 f17c1a8b..64d46769 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 b64125e3..ad1b8164 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 57e1f610..f2f60f0b 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 2c8f3160..48e58209 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 c2b26d08..9579e648 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 c8f33550..82ee3580 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 d8b5f1c8..2fb5e675 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 8a0e3ee1..2c1eea38 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 1a1a9f4c..da43432f 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 107bab88..27f69acb 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 ab86afd6..9104b7e1 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 22d7c715..132b557f 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 7826759f..8e73212a 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 f0267eba..c1234028 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 f52d2e62..96482b5c 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 b9a7ab29..27ef4c6a 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 3073a512..5043722e 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 b0dfda96..c20a9d59 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 08dbf744..4e6fed7a 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 20573f39..87bff129 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 2b93bfdc..ef0d9eab 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 46011334..7748d9ca 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 7ca7ad35..0a02cf91 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 632dfd17..656ffd68 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 26f2bcab..474195f6 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 006a54b9..45da8eba 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 87067568..199514df 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 e4e8b25d..d27111bc 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 4d810a62..abb39715 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 5b7a2333..cc15a5ed 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 c8e63465..79d5ecd8 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 d5ddb5cd..73ae9ff6 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 c6bb1863..3c0a3fa0 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 045d7ab6..00cc4c66 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 7a5a029a..9ff1003b 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 624ccd79..01cfdbfd 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 32d2d4b1..cd406c15 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 70eefbe7..03215f19 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 f8a6efb2..4e040b9a 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 e77d6e51..27b72811 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 7ddbde76..29f6f856 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 da37a7fe..da9f1c22 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 9b8f1f92..359a6816 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 63bc2c18..5b85e670 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 51169d6b..39f21306 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 907c2b8a..75afa1c9 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 51d12591..e4b558ff 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 506ebf0c..2e75fefb 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 03633f5c..1ca426f6 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 e6f79f46..321b55b7 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 9a9c9b9c..4e1fa7df 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 a12e4b17..b5feea07 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 397cb7d6..dde63a17 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 c795cd36..0e10af3f 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: