Skip to content

Commit

Permalink
Fix imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@turt2live
turt2live committed Feb 11, 2024
1 parent 72b7a38 commit f370909
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 33 deletions.
10 changes: 5 additions & 5 deletions api/_routers/97-require-server-auth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package _routers
import (
"net/http"

"github.com/turt2live/matrix-media-repo/api/_apimeta"
"github.com/turt2live/matrix-media-repo/api/_responses"
"github.com/turt2live/matrix-media-repo/common"
"github.com/turt2live/matrix-media-repo/common/rcontext"
"github.com/turt2live/matrix-media-repo/matrix"
"github.com/t2bot/matrix-media-repo/api/_apimeta"
"github.com/t2bot/matrix-media-repo/api/_responses"
"github.com/t2bot/matrix-media-repo/common"
"github.com/t2bot/matrix-media-repo/common/rcontext"
"github.com/t2bot/matrix-media-repo/matrix"
)

type GeneratorWithServerFn = func(r *http.Request, ctx rcontext.RequestContext, server _apimeta.ServerInfo) interface{}
Expand Down
10 changes: 5 additions & 5 deletions api/unstable/msc3916_download.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"bytes"
"net/http"

"github.com/turt2live/matrix-media-repo/api/_apimeta"
"github.com/turt2live/matrix-media-repo/api/_responses"
"github.com/turt2live/matrix-media-repo/api/r0"
"github.com/turt2live/matrix-media-repo/common/rcontext"
"github.com/turt2live/matrix-media-repo/util/readers"
"github.com/t2bot/matrix-media-repo/api/_apimeta"
"github.com/t2bot/matrix-media-repo/api/_responses"
"github.com/t2bot/matrix-media-repo/api/r0"
"github.com/t2bot/matrix-media-repo/common/rcontext"
"github.com/t2bot/matrix-media-repo/util/readers"
)

func ClientDownloadMedia(r *http.Request, rctx rcontext.RequestContext, user _apimeta.UserInfo) interface{} {
Expand Down
10 changes: 5 additions & 5 deletions api/unstable/msc3916_thumbnail.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"bytes"
"net/http"

"github.com/turt2live/matrix-media-repo/api/_apimeta"
"github.com/turt2live/matrix-media-repo/api/_responses"
"github.com/turt2live/matrix-media-repo/api/r0"
"github.com/turt2live/matrix-media-repo/common/rcontext"
"github.com/turt2live/matrix-media-repo/util/readers"
"github.com/t2bot/matrix-media-repo/api/_apimeta"
"github.com/t2bot/matrix-media-repo/api/_responses"
"github.com/t2bot/matrix-media-repo/api/r0"
"github.com/t2bot/matrix-media-repo/common/rcontext"
"github.com/t2bot/matrix-media-repo/util/readers"
)

func FederationThumbnailMedia(r *http.Request, rctx rcontext.RequestContext, server _apimeta.ServerInfo) interface{} {
Expand Down
2 changes: 1 addition & 1 deletion docs/msc3916.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ To set up a signing key for MMR:
1. Back up your existing homeserver signing key, and store it in a safe place. The signing key effectively grants full
access to your server and events, and should not be disclosed to anyone.
2. Download the `generate_signing_key` and `combine_signing_keys` tools for your version of MMR from the
[GitHub releases page](https://github.com/turt2live/matrix-media-repo/releases).
[GitHub releases page](https://github.com/t2bot/matrix-media-repo/releases).
3. Run `./generate_signing_key -output mmr.signing.key` to create a signing key usable with MMR.
4. If you're using Synapse as your homeserver software, run `./combine_signing_keys -format synapse -output ./merged.signing.key ./existing.signing.key ./mmr.signing.key`
to combine the signing keys, being sure to list Synapse's existing signing key *first* in the arguments. For all other
Expand Down
6 changes: 3 additions & 3 deletions matrix/requests_signing.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/patrickmn/go-cache"
"github.com/sirupsen/logrus"
"github.com/t2bot/go-typed-singleflight"
"github.com/turt2live/matrix-media-repo/common/rcontext"
"github.com/turt2live/matrix-media-repo/database"
"github.com/turt2live/matrix-media-repo/util"
"github.com/t2bot/matrix-media-repo/common/rcontext"
"github.com/t2bot/matrix-media-repo/database"
"github.com/t2bot/matrix-media-repo/util"
)

type signingKey struct {
Expand Down
4 changes: 2 additions & 2 deletions matrix/xmatrix.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"net/http"

"github.com/turt2live/matrix-media-repo/database"
"github.com/turt2live/matrix-media-repo/util"
"github.com/t2bot/matrix-media-repo/database"
"github.com/t2bot/matrix-media-repo/util"
)

var ErrNoXMatrixAuth = errors.New("no X-Matrix auth headers")
Expand Down
4 changes: 2 additions & 2 deletions test/msc3916_downloads_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"github.com/turt2live/matrix-media-repo/test/test_internals"
"github.com/turt2live/matrix-media-repo/util"
"github.com/t2bot/matrix-media-repo/test/test_internals"
"github.com/t2bot/matrix-media-repo/util"
)

type MSC3916DownloadsSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion test/msc3916_misc_client_endpoints_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"github.com/turt2live/matrix-media-repo/test/test_internals"
"github.com/t2bot/matrix-media-repo/test/test_internals"
)

type MSC3916MiscClientEndpointsSuite struct {
Expand Down
4 changes: 2 additions & 2 deletions test/msc3916_thumbnails_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"github.com/turt2live/matrix-media-repo/test/test_internals"
"github.com/turt2live/matrix-media-repo/util"
"github.com/t2bot/matrix-media-repo/test/test_internals"
"github.com/t2bot/matrix-media-repo/util"
)

type MSC3916ThumbnailsSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions test/signing_keys_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/turt2live/matrix-media-repo/database"
"github.com/turt2live/matrix-media-repo/matrix"
"github.com/turt2live/matrix-media-repo/util"
"github.com/t2bot/matrix-media-repo/database"
"github.com/t2bot/matrix-media-repo/matrix"
"github.com/t2bot/matrix-media-repo/util"
)

func TestFailInjectedKeys(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions test/xmatrix_header_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"crypto/ed25519"
"testing"

"github.com/turt2live/matrix-media-repo/common/config"
"github.com/turt2live/matrix-media-repo/database"
"github.com/turt2live/matrix-media-repo/matrix"
"github.com/turt2live/matrix-media-repo/util"
"github.com/t2bot/matrix-media-repo/common/config"
"github.com/t2bot/matrix-media-repo/database"
"github.com/t2bot/matrix-media-repo/matrix"
"github.com/t2bot/matrix-media-repo/util"
)

func TestXMatrixAuthHeader(t *testing.T) {
Expand Down

0 comments on commit f370909

Please sign in to comment.