run goimports

appservice/consumers/roomserver.go

@@ -16,6 +16,7 @@ package consumers
 
 import (
 	"context"
+
 	json "github.com/json-iterator/go"
 
 	"github.com/matrix-org/dendrite/appservice/storage"

appservice/inthttp/server.go

@@ -1,9 +1,10 @@
 package inthttp
 
 import (
-	json "github.com/json-iterator/go"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/gorilla/mux"
 	"github.com/matrix-org/dendrite/appservice/api"
 	"github.com/matrix-org/dendrite/internal/httputil"

appservice/storage/postgres/appservice_events_table.go

@@ -18,9 +18,10 @@ package postgres
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/gomatrixserverlib"
 	log "github.com/sirupsen/logrus"
 )

appservice/storage/sqlite3/appservice_events_table.go

@@ -18,9 +18,10 @@ package sqlite3
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 	"github.com/matrix-org/gomatrixserverlib"
 	log "github.com/sirupsen/logrus"

appservice/workers/transaction_scheduler.go

@@ -17,13 +17,14 @@ package workers
 import (
 	"bytes"
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"math"
 	"net/http"
 	"net/url"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/appservice/storage"
 	"github.com/matrix-org/dendrite/appservice/types"
 	"github.com/matrix-org/dendrite/internal/config"

clientapi/auth/user_interactive.go

@@ -16,9 +16,10 @@ package auth
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/dendrite/internal/config"
 	"github.com/matrix-org/dendrite/userapi/api"

clientapi/auth/user_interactive_test.go

@@ -2,10 +2,11 @@ package auth
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"testing"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal/config"
 	"github.com/matrix-org/dendrite/userapi/api"
 	"github.com/matrix-org/gomatrixserverlib"

clientapi/httputil/httputil.go

@@ -15,11 +15,12 @@
 package httputil
 
 import (
-	json "github.com/json-iterator/go"
 	"io/ioutil"
 	"net/http"
 	"unicode/utf8"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/util"
 )

clientapi/jsonerror/jsonerror_test.go

@@ -15,8 +15,9 @@
 package jsonerror
 
 import (
-	json "github.com/json-iterator/go"
 	"testing"
+
+	json "github.com/json-iterator/go"
 )
 
 func TestLimitExceeded(t *testing.T) {

clientapi/routing/account_data.go

@@ -16,10 +16,11 @@ package routing
 
 import (
 	"fmt"
-	json "github.com/json-iterator/go"
 	"io/ioutil"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/httputil"
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/dendrite/clientapi/producers"

clientapi/routing/createroom.go

@@ -15,12 +15,13 @@
 package routing
 
 import (
-	json "github.com/json-iterator/go"
 	"fmt"
 	"net/http"
 	"strings"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	appserviceAPI "github.com/matrix-org/dendrite/appservice/api"
 	roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
 	roomserverVersion "github.com/matrix-org/dendrite/roomserver/version"

clientapi/routing/keys.go

@@ -15,10 +15,11 @@
 package routing
 
 import (
-	json "github.com/json-iterator/go"
 	"net/http"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/httputil"
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/dendrite/keyserver/api"

clientapi/routing/memberships.go

@@ -15,9 +15,10 @@
 package routing
 
 import (
-	json "github.com/json-iterator/go"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/dendrite/internal/config"
 	"github.com/matrix-org/dendrite/roomserver/api"

clientapi/routing/register.go

@@ -19,7 +19,6 @@ import (
 	"context"
 	"crypto/hmac"
 	"crypto/sha1"
-	json "github.com/json-iterator/go"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -32,6 +31,8 @@ import (
 	"sync"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal/config"
 	"github.com/matrix-org/dendrite/internal/eventutil"
 

clientapi/routing/room_tagging.go

@@ -15,9 +15,10 @@
 package routing
 
 import (
-	json "github.com/json-iterator/go"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/sirupsen/logrus"
 
 	"github.com/matrix-org/dendrite/clientapi/httputil"

clientapi/routing/routing.go

@@ -15,10 +15,11 @@
 package routing
 
 import (
-	json "github.com/json-iterator/go"
 	"net/http"
 	"strings"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/gorilla/mux"
 	appserviceAPI "github.com/matrix-org/dendrite/appservice/api"
 	"github.com/matrix-org/dendrite/clientapi/api"

clientapi/routing/sendtodevice.go

@@ -13,9 +13,10 @@
 package routing
 
 import (
-	json "github.com/json-iterator/go"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/httputil"
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/dendrite/eduserver/api"

clientapi/routing/state.go

@@ -16,10 +16,11 @@ package routing
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/dendrite/roomserver/api"
 	userapi "github.com/matrix-org/dendrite/userapi/api"

clientapi/threepid/invites.go

@@ -16,7 +16,6 @@ package threepid
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"errors"
 	"fmt"
 	"net/http"
@@ -24,6 +23,8 @@ import (
 	"strings"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
 	"github.com/matrix-org/dendrite/internal/config"
 	"github.com/matrix-org/dendrite/internal/eventutil"

clientapi/threepid/threepid.go

@@ -16,7 +16,6 @@ package threepid
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"errors"
 	"fmt"
 	"net/http"
@@ -24,6 +23,8 @@ import (
 	"strconv"
 	"strings"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal/config"
 )
 

cmd/create-room-events/main.go

@@ -18,13 +18,14 @@ package main
 
 import (
 	"encoding/base64"
-	json "github.com/json-iterator/go"
 	"flag"
 	"fmt"
 	"os"
 	"strings"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/gomatrixserverlib"
 	"golang.org/x/crypto/ed25519"

cmd/dendrite-demo-libp2p/publicrooms.go

@@ -16,12 +16,13 @@ package main
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"sync"
 	"sync/atomic"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
 
 	pubsub "github.com/libp2p/go-libp2p-pubsub"

cmd/dendrite-demo-yggdrasil/yggconn/node.go

@@ -19,7 +19,6 @@ import (
 	"crypto/ed25519"
 	"crypto/tls"
 	"encoding/hex"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -29,6 +28,8 @@ import (
 	"sync"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/lucas-clemente/quic-go"
 	"github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/convert"
 	"github.com/matrix-org/gomatrixserverlib"

cmd/furl/main.go

@@ -5,7 +5,6 @@ import (
 	"bytes"
 	"context"
 	"crypto/ed25519"
-	json "github.com/json-iterator/go"
 	"encoding/pem"
 	"flag"
 	"fmt"
@@ -13,6 +12,8 @@ import (
 	"net/url"
 	"os"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/gomatrixserverlib"
 )
 

cmd/syncserver-integration-tests/main.go

@@ -15,7 +15,6 @@
 package main
 
 import (
-	json "github.com/json-iterator/go"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -24,6 +23,8 @@ import (
 	"path/filepath"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal/config"
 	"github.com/matrix-org/dendrite/internal/test"
 	"github.com/matrix-org/dendrite/roomserver/api"

eduserver/api/wrapper.go

@@ -16,9 +16,10 @@ package api
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/gomatrixserverlib"
 )
 

eduserver/input/input.go

@@ -18,9 +18,10 @@ package input
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/Shopify/sarama"
 	"github.com/matrix-org/dendrite/eduserver/api"
 	"github.com/matrix-org/dendrite/eduserver/cache"

eduserver/inthttp/server.go

@@ -1,9 +1,10 @@
 package inthttp
 
 import (
-	json "github.com/json-iterator/go"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/gorilla/mux"
 	"github.com/matrix-org/dendrite/eduserver/api"
 	"github.com/matrix-org/dendrite/internal/httputil"

federationapi/routing/backfill.go

@@ -15,12 +15,13 @@
 package routing
 
 import (
-	json "github.com/json-iterator/go"
 	"fmt"
 	"net/http"
 	"strconv"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/dendrite/internal/config"
 	"github.com/matrix-org/dendrite/roomserver/api"

federationapi/routing/devices.go

@@ -13,9 +13,10 @@
 package routing
 
 import (
-	json "github.com/json-iterator/go"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	keyapi "github.com/matrix-org/dendrite/keyserver/api"
 	"github.com/matrix-org/gomatrixserverlib"

federationapi/routing/events.go

@@ -16,10 +16,11 @@ package routing
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"net/http"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/matrix-org/util"

federationapi/routing/invite.go

@@ -16,10 +16,11 @@ package routing
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/dendrite/internal/config"
 	"github.com/matrix-org/dendrite/roomserver/api"

federationapi/routing/keys.go

@@ -15,10 +15,11 @@
 package routing
 
 import (
-	json "github.com/json-iterator/go"
 	"net/http"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/httputil"
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	federationSenderAPI "github.com/matrix-org/dendrite/federationsender/api"

federationapi/routing/missingevents.go

@@ -13,9 +13,10 @@
 package routing
 
 import (
-	json "github.com/json-iterator/go"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/gomatrixserverlib"

federationapi/routing/send.go

@@ -18,11 +18,12 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	json "github.com/json-iterator/go"
 	"net/http"
 	"sync"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	eduserverAPI "github.com/matrix-org/dendrite/eduserver/api"
 	"github.com/matrix-org/dendrite/internal/config"

federationapi/routing/send_test.go

@@ -2,12 +2,13 @@ package routing
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"reflect"
 	"testing"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	eduAPI "github.com/matrix-org/dendrite/eduserver/api"
 	fsAPI "github.com/matrix-org/dendrite/federationsender/api"
 	"github.com/matrix-org/dendrite/internal/test"

federationapi/routing/threepid.go

@@ -16,11 +16,12 @@ package routing
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"errors"
 	"net/http"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/httputil"
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/dendrite/internal/config"

federationsender/consumers/eduserver.go

@@ -17,6 +17,7 @@ package consumers
 import (
 	"context"
 	"fmt"
+
 	json "github.com/json-iterator/go"
 
 	"github.com/Shopify/sarama"

federationsender/consumers/keychange.go

@@ -16,9 +16,10 @@ package consumers
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/Shopify/sarama"
 	"github.com/matrix-org/dendrite/federationsender/queue"
 	"github.com/matrix-org/dendrite/federationsender/storage"

federationsender/consumers/roomserver.go

@@ -16,9 +16,10 @@ package consumers
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/Shopify/sarama"
 	"github.com/matrix-org/dendrite/federationsender/queue"
 	"github.com/matrix-org/dendrite/federationsender/storage"

federationsender/inthttp/server.go

@@ -1,9 +1,10 @@
 package inthttp
 
 import (
-	json "github.com/json-iterator/go"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/gorilla/mux"
 	"github.com/matrix-org/dendrite/federationsender/api"
 	"github.com/matrix-org/dendrite/internal/httputil"

federationsender/queue/destinationqueue.go

@@ -16,11 +16,12 @@ package queue
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"sync"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/federationsender/statistics"
 	"github.com/matrix-org/dendrite/federationsender/storage"
 	"github.com/matrix-org/dendrite/federationsender/storage/shared"

federationsender/queue/queue.go

@@ -17,11 +17,12 @@ package queue
 import (
 	"context"
 	"crypto/ed25519"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"sync"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/federationsender/statistics"
 	"github.com/matrix-org/dendrite/federationsender/storage"
 	"github.com/matrix-org/dendrite/roomserver/api"

federationsender/storage/shared/storage.go

@@ -17,9 +17,10 @@ package shared
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"fmt"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/federationsender/storage/tables"
 	"github.com/matrix-org/dendrite/federationsender/types"
 	"github.com/matrix-org/dendrite/internal/sqlutil"

federationsender/storage/shared/storage_edus.go

@@ -17,10 +17,11 @@ package shared
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"errors"
 	"fmt"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/gomatrixserverlib"
 )
 

federationsender/storage/shared/storage_pdus.go

@@ -17,10 +17,11 @@ package shared
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"errors"
 	"fmt"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/gomatrixserverlib"
 )
 

internal/httputil/http.go

@@ -17,12 +17,13 @@ package httputil
 import (
 	"bytes"
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"net/http"
 	"net/url"
 	"strings"
 
+	json "github.com/json-iterator/go"
+
 	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/opentracing/opentracing-go/ext"
 )

keyserver/api/api.go

@@ -16,10 +16,11 @@ package api
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"strings"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	userapi "github.com/matrix-org/dendrite/userapi/api"
 	"github.com/matrix-org/gomatrixserverlib"
 )

keyserver/internal/device_list_update.go

@@ -16,12 +16,13 @@ package internal
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"hash/fnv"
 	"sync"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	fedsenderapi "github.com/matrix-org/dendrite/federationsender/api"
 	"github.com/matrix-org/dendrite/keyserver/api"
 	"github.com/matrix-org/gomatrixserverlib"

keyserver/internal/internal.go

@@ -17,11 +17,12 @@ package internal
 import (
 	"bytes"
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"sync"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	fedsenderapi "github.com/matrix-org/dendrite/federationsender/api"
 	"github.com/matrix-org/dendrite/keyserver/api"
 	"github.com/matrix-org/dendrite/keyserver/producers"

keyserver/inthttp/server.go

@@ -15,9 +15,10 @@
 package inthttp
 
 import (
-	json "github.com/json-iterator/go"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/gorilla/mux"
 	"github.com/matrix-org/dendrite/internal/httputil"
 	"github.com/matrix-org/dendrite/keyserver/api"

keyserver/producers/keychange.go

@@ -16,6 +16,7 @@ package producers
 
 import (
 	"context"
+
 	json "github.com/json-iterator/go"
 
 	"github.com/Shopify/sarama"

keyserver/storage/interface.go

@@ -16,6 +16,7 @@ package storage
 
 import (
 	"context"
+
 	json "github.com/json-iterator/go"
 	"github.com/matrix-org/dendrite/keyserver/api"
 	"github.com/matrix-org/gomatrixserverlib"

keyserver/storage/postgres/one_time_keys_table.go

@@ -17,9 +17,10 @@ package postgres
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 	"github.com/matrix-org/dendrite/keyserver/api"

keyserver/storage/shared/storage.go

@@ -17,6 +17,7 @@ package shared
 import (
 	"context"
 	"database/sql"
+
 	json "github.com/json-iterator/go"
 
 	"github.com/matrix-org/dendrite/internal/sqlutil"

keyserver/storage/sqlite3/one_time_keys_table.go

@@ -17,9 +17,10 @@ package sqlite3
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 	"github.com/matrix-org/dendrite/keyserver/api"

keyserver/storage/tables/interface.go

@@ -17,6 +17,7 @@ package tables
 import (
 	"context"
 	"database/sql"
+
 	json "github.com/json-iterator/go"
 	"github.com/matrix-org/dendrite/keyserver/api"
 	"github.com/matrix-org/gomatrixserverlib"

mediaapi/routing/download.go

@@ -16,7 +16,6 @@ package routing
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"io"
 	"mime"
@@ -30,6 +29,8 @@ import (
 	"sync"
 	"unicode"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/dendrite/internal/config"
 	"github.com/matrix-org/dendrite/mediaapi/fileutils"

roomserver/acls/acls.go

@@ -16,13 +16,14 @@ package acls
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"net"
 	"regexp"
 	"strings"
 	"sync"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/sirupsen/logrus"
 )

roomserver/api/api_trace.go

@@ -2,9 +2,10 @@ package api
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 
+	json "github.com/json-iterator/go"
+
 	fsAPI "github.com/matrix-org/dendrite/federationsender/api"
 	"github.com/matrix-org/util"
 )

roomserver/api/perform.go

@@ -1,10 +1,11 @@
 package api
 
 import (
-	json "github.com/json-iterator/go"
 	"fmt"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/matrix-org/util"

roomserver/api/query.go

@@ -17,10 +17,11 @@
 package api
 
 import (
-	json "github.com/json-iterator/go"
 	"fmt"
 	"strings"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
 	"github.com/matrix-org/gomatrixserverlib"
 )

roomserver/internal/alias.go

@@ -16,11 +16,12 @@ package internal
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"errors"
 	"fmt"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/gomatrixserverlib"
 )

roomserver/internal/input/input.go

@@ -17,10 +17,11 @@ package input
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"sync"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/Shopify/sarama"
 	"github.com/matrix-org/dendrite/roomserver/acls"
 	"github.com/matrix-org/dendrite/roomserver/api"

roomserver/internal/perform/perform_peek.go

@@ -16,10 +16,11 @@ package perform
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"strings"
 
+	json "github.com/json-iterator/go"
+
 	fsAPI "github.com/matrix-org/dendrite/federationsender/api"
 	"github.com/matrix-org/dendrite/internal/config"
 	"github.com/matrix-org/dendrite/roomserver/api"

roomserver/internal/query/query_test.go

@@ -16,9 +16,10 @@ package query
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"testing"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal/test"
 	"github.com/matrix-org/dendrite/roomserver/types"
 	"github.com/matrix-org/gomatrixserverlib"

roomserver/inthttp/server.go

@@ -1,9 +1,10 @@
 package inthttp
 
 import (
-	json "github.com/json-iterator/go"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/gorilla/mux"
 	"github.com/matrix-org/dendrite/internal/httputil"
 	"github.com/matrix-org/dendrite/roomserver/api"

roomserver/roomserver_test.go

@@ -4,13 +4,14 @@ import (
 	"bytes"
 	"context"
 	"crypto/ed25519"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"os"
 	"reflect"
 	"testing"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/Shopify/sarama"
 	"github.com/matrix-org/dendrite/internal/caching"
 	"github.com/matrix-org/dendrite/internal/config"

roomserver/storage/shared/storage.go

@@ -3,10 +3,11 @@ package shared
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"sort"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal/caching"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 	"github.com/matrix-org/dendrite/roomserver/api"

roomserver/storage/sqlite3/events_table.go

@@ -18,10 +18,11 @@ package sqlite3
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"strings"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 	"github.com/matrix-org/dendrite/roomserver/storage/shared"

roomserver/storage/sqlite3/rooms_table.go

@@ -18,11 +18,12 @@ package sqlite3
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"errors"
 	"fmt"
 	"strings"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 	"github.com/matrix-org/dendrite/roomserver/storage/shared"

roomserver/storage/sqlite3/state_snapshot_table.go

@@ -18,10 +18,11 @@ package sqlite3
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"strings"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 	"github.com/matrix-org/dendrite/roomserver/storage/shared"

signingkeyserver/inthttp/server.go

@@ -1,9 +1,10 @@
 package inthttp
 
 import (
-	json "github.com/json-iterator/go"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/gorilla/mux"
 	"github.com/matrix-org/dendrite/internal/caching"
 	"github.com/matrix-org/dendrite/internal/httputil"

signingkeyserver/serverkeyapi_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"crypto/ed25519"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -13,6 +12,8 @@ import (
 	"testing"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/federationapi/routing"
 	"github.com/matrix-org/dendrite/internal/caching"
 	"github.com/matrix-org/dendrite/internal/config"

syncapi/consumers/clientapi.go

@@ -16,6 +16,7 @@ package consumers
 
 import (
 	"context"
+
 	json "github.com/json-iterator/go"
 
 	"github.com/Shopify/sarama"

syncapi/consumers/eduserver_sendtodevice.go

@@ -16,6 +16,7 @@ package consumers
 
 import (
 	"context"
+
 	json "github.com/json-iterator/go"
 
 	"github.com/Shopify/sarama"

syncapi/consumers/keychange.go

@@ -16,9 +16,10 @@ package consumers
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"sync"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/Shopify/sarama"
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/keyserver/api"

syncapi/consumers/roomserver.go

@@ -16,9 +16,10 @@ package consumers
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/Shopify/sarama"
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/config"

syncapi/routing/filter.go

@@ -15,10 +15,11 @@
 package routing
 
 import (
-	json "github.com/json-iterator/go"
 	"io/ioutil"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/dendrite/syncapi/storage"
 	"github.com/matrix-org/dendrite/syncapi/sync"

syncapi/storage/postgres/current_room_state_table.go

@@ -18,6 +18,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	json "github.com/json-iterator/go"
 
 	"github.com/lib/pq"

syncapi/storage/postgres/filter_table.go

@@ -17,6 +17,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	json "github.com/json-iterator/go"
 
 	"github.com/matrix-org/dendrite/syncapi/storage/tables"

syncapi/storage/postgres/invites_table.go

@@ -18,6 +18,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	json "github.com/json-iterator/go"
 
 	"github.com/matrix-org/dendrite/internal"

syncapi/storage/postgres/output_room_events_table.go

@@ -18,9 +18,10 @@ package postgres
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"sort"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/dendrite/syncapi/storage/tables"

syncapi/storage/postgres/send_to_device_table.go

@@ -17,6 +17,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	json "github.com/json-iterator/go"
 
 	"github.com/lib/pq"

syncapi/storage/shared/syncserver.go

@@ -17,10 +17,11 @@ package shared
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	userapi "github.com/matrix-org/dendrite/userapi/api"
 
 	"github.com/matrix-org/dendrite/eduserver/cache"

syncapi/storage/sqlite3/current_room_state_table.go

@@ -18,9 +18,10 @@ package sqlite3
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"strings"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 	"github.com/matrix-org/dendrite/syncapi/storage/tables"

syncapi/storage/sqlite3/filter_table.go

@@ -17,9 +17,10 @@ package sqlite3
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"fmt"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/syncapi/storage/tables"
 	"github.com/matrix-org/gomatrixserverlib"
 )

syncapi/storage/sqlite3/invites_table.go

@@ -18,6 +18,7 @@ package sqlite3
 import (
 	"context"
 	"database/sql"
+
 	json "github.com/json-iterator/go"
 
 	"github.com/matrix-org/dendrite/internal"

syncapi/storage/sqlite3/output_room_events_table.go

@@ -18,9 +18,10 @@ package sqlite3
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"sort"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/dendrite/syncapi/storage/tables"

syncapi/storage/sqlite3/send_to_device_table.go

@@ -17,9 +17,10 @@ package sqlite3
 import (
 	"context"
 	"database/sql"
-	json "github.com/json-iterator/go"
 	"strings"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 	"github.com/matrix-org/dendrite/syncapi/storage/tables"

syncapi/storage/storage_test.go

@@ -3,12 +3,13 @@ package storage_test
 import (
 	"context"
 	"crypto/ed25519"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"os"
 	"testing"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/internal/config"
 	"github.com/matrix-org/dendrite/syncapi/storage"
 	"github.com/matrix-org/dendrite/syncapi/storage/sqlite3"

syncapi/sync/notifier_test.go

@@ -16,12 +16,13 @@ package sync
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"fmt"
 	"sync"
 	"testing"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/syncapi/types"
 	userapi "github.com/matrix-org/dendrite/userapi/api"
 	"github.com/matrix-org/gomatrixserverlib"

syncapi/sync/request.go

@@ -16,11 +16,12 @@ package sync
 
 import (
 	"context"
-	json "github.com/json-iterator/go"
 	"net/http"
 	"strconv"
 	"time"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/syncapi/storage"
 	"github.com/matrix-org/dendrite/syncapi/types"
 	userapi "github.com/matrix-org/dendrite/userapi/api"

syncapi/types/types.go

@@ -17,11 +17,12 @@ package types
 import (
 	"errors"
 	"fmt"
-	json "github.com/json-iterator/go"
 	"sort"
 	"strconv"
 	"strings"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/tidwall/gjson"

syncapi/types/types_test.go

@@ -1,10 +1,11 @@
 package types
 
 import (
-	json "github.com/json-iterator/go"
 	"reflect"
 	"testing"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/matrix-org/gomatrixserverlib"
 )
 

userapi/api/api.go

@@ -16,6 +16,7 @@ package api
 
 import (
 	"context"
+
 	json "github.com/json-iterator/go"
 
 	"github.com/matrix-org/dendrite/clientapi/auth/authtypes"

userapi/internal/api.go

@@ -19,6 +19,7 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+
 	json "github.com/json-iterator/go"
 
 	"github.com/matrix-org/dendrite/appservice/types"

userapi/inthttp/server.go

@@ -15,9 +15,10 @@
 package inthttp
 
 import (
-	json "github.com/json-iterator/go"
 	"net/http"
 
+	json "github.com/json-iterator/go"
+
 	"github.com/gorilla/mux"
 	"github.com/matrix-org/dendrite/internal/httputil"
 	"github.com/matrix-org/dendrite/userapi/api"

userapi/storage/accounts/interface.go

@@ -17,6 +17,7 @@ package accounts
 import (
 	"context"
 	"errors"
+
 	json "github.com/json-iterator/go"
 
 	"github.com/matrix-org/dendrite/clientapi/auth/authtypes"

userapi/storage/accounts/postgres/account_data_table.go

@@ -17,6 +17,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	json "github.com/json-iterator/go"
 
 	"github.com/matrix-org/dendrite/internal"