From 6d1b595ce8d5dc75b9f43e9974fa40e2850327a1 Mon Sep 17 00:00:00 2001 From: adnull Date: Thu, 14 Nov 2024 19:41:22 +0100 Subject: [PATCH] mods relocate + licence Signed-off-by: adnull --- go.mod | 3 +-- mediaapi/routing/url_preview.go | 22 +++++++++++++++------- mediaapi/routing/url_preview_test.go | 20 +++++++++++++------- 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index b2d3cbfc..238301c9 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( 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/net v0.29.0 + golang.org/x/net v0.30.0 golang.org/x/sync v0.9.0 golang.org/x/term v0.25.0 gopkg.in/h2non/bimg.v1 v1.1.9 @@ -142,7 +142,6 @@ require ( go.opentelemetry.io/otel/trace v1.32.0 // indirect go.uber.org/mock v0.4.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 diff --git a/mediaapi/routing/url_preview.go b/mediaapi/routing/url_preview.go index af011820..083fe161 100644 --- a/mediaapi/routing/url_preview.go +++ b/mediaapi/routing/url_preview.go @@ -1,3 +1,9 @@ +// Copyright 2024 New Vector Ltd. +// Copyright 2017 Vector Creations Ltd +// +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. + package routing import ( @@ -19,13 +25,15 @@ import ( "sync" "time" - "github.com/matrix-org/dendrite/internal/httputil" - "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/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/element-hq/dendrite/mediaapi/fileutils" + "github.com/element-hq/dendrite/mediaapi/thumbnailer" + "github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/util" "github.com/pkg/errors" diff --git a/mediaapi/routing/url_preview_test.go b/mediaapi/routing/url_preview_test.go index 6a46e0b6..3665cb0a 100644 --- a/mediaapi/routing/url_preview_test.go +++ b/mediaapi/routing/url_preview_test.go @@ -1,3 +1,9 @@ +// Copyright 2024 New Vector Ltd. +// Copyright 2017 Vector Creations Ltd +// +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. + package routing import ( @@ -15,13 +21,13 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/internal/httputil" - "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" - 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/fileutils" + "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" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" )