Add gofmt linter (#339)

* Check that gofmt has been run

* gofmt files

* Tabs and spaces
This commit is contained in:
Erik Johnston 2017-11-16 10:12:02 +00:00 committed by GitHub
parent 4124ce2ac0
commit 561315e1d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 25 additions and 23 deletions

View File

@ -11,6 +11,7 @@
"misspell",
"errcheck",
"vet",
"gofmt",
"goconst"
]
}

View File

@ -17,6 +17,7 @@
"errcheck",
"vet",
"megacheck",
"gofmt",
"goconst"
]
}

View File

@ -23,7 +23,6 @@ import (
"github.com/matrix-org/dendrite/roomserver/api"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
"github.com/matrix-org/dendrite/clientapi/httputil"
@ -33,6 +32,7 @@ import (
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/util"
log "github.com/sirupsen/logrus"
)
// https://matrix.org/docs/spec/client_server/r0.2.0.html#post-matrix-client-r0-createroom

View File

@ -24,16 +24,16 @@ import (
"time"
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/matrix-org/dendrite/clientapi/httputil"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/util"
"github.com/matrix-org/dendrite/clientapi/httputil"
)
type turnServerResponse struct {
Username string `json:"username"`
Password string `json:"password"`
URIs []string `json:"uris"`
TTL int `json:"ttl"`
Username string `json:"username"`
Password string `json:"password"`
URIs []string `json:"uris"`
TTL int `json:"ttl"`
}
// RequestTurnServer implements:
@ -54,7 +54,7 @@ func RequestTurnServer(req *http.Request, device *authtypes.Device, cfg config.D
resp := turnServerResponse{
URIs: turnConfig.URIs,
TTL: int(duration.Seconds()),
TTL: int(duration.Seconds()),
}
if turnConfig.SharedSecret != "" {

View File

@ -20,7 +20,6 @@ import (
_ "net/http/pprof"
"os"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/roomserver/alias"
@ -28,6 +27,7 @@ import (
"github.com/matrix-org/dendrite/roomserver/query"
"github.com/matrix-org/dendrite/roomserver/storage"
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"
sarama "gopkg.in/Shopify/sarama.v1"
)

View File

@ -25,8 +25,8 @@ import (
"strings"
"time"
"github.com/sirupsen/logrus"
"github.com/matrix-org/gomatrixserverlib"
"github.com/sirupsen/logrus"
"golang.org/x/crypto/ed25519"
"gopkg.in/yaml.v2"

View File

@ -18,8 +18,8 @@ import (
"os"
"path/filepath"
"github.com/sirupsen/logrus"
"github.com/matrix-org/dugong"
"github.com/sirupsen/logrus"
)
type utcFormatter struct {

View File

@ -19,7 +19,6 @@ import (
"encoding/json"
"fmt"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/federationsender/queue"
@ -27,6 +26,7 @@ import (
"github.com/matrix-org/dendrite/federationsender/types"
"github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/gomatrixserverlib"
log "github.com/sirupsen/logrus"
sarama "gopkg.in/Shopify/sarama.v1"
)

View File

@ -20,8 +20,8 @@ import (
"sync"
"time"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/gomatrixserverlib"
log "github.com/sirupsen/logrus"
)
// destinationQueue is a queue of events for a single destination.

View File

@ -18,8 +18,8 @@ import (
"fmt"
"sync"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/gomatrixserverlib"
log "github.com/sirupsen/logrus"
)
// OutgoingQueues is a collection of queues for sending transactions to other

View File

@ -25,9 +25,9 @@ import (
"path/filepath"
"strings"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/mediaapi/types"
log "github.com/sirupsen/logrus"
)
// GetPathFromBase64Hash evaluates the path to a media file from its Base64Hash

View File

@ -28,7 +28,6 @@ import (
"strings"
"sync"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/clientapi/jsonerror"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/mediaapi/fileutils"
@ -38,6 +37,7 @@ import (
"github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/util"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
)
const mediaIDCharacters = "A-Za-z0-9_=-"

View File

@ -22,10 +22,10 @@ import (
"path/filepath"
"sync"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/mediaapi/storage"
"github.com/matrix-org/dendrite/mediaapi/types"
log "github.com/sirupsen/logrus"
)
type thumbnailFitness struct {

View File

@ -21,10 +21,10 @@ import (
"os"
"time"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/mediaapi/storage"
"github.com/matrix-org/dendrite/mediaapi/types"
log "github.com/sirupsen/logrus"
"gopkg.in/h2non/bimg.v1"
)

View File

@ -28,11 +28,11 @@ import (
"os"
"time"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/mediaapi/storage"
"github.com/matrix-org/dendrite/mediaapi/types"
"github.com/nfnt/resize"
log "github.com/sirupsen/logrus"
)
// GenerateThumbnails generates the configured thumbnail sizes for the source file

View File

@ -18,11 +18,11 @@ import (
"context"
"encoding/json"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/publicroomsapi/storage"
"github.com/matrix-org/dendrite/roomserver/api"
log "github.com/sirupsen/logrus"
sarama "gopkg.in/Shopify/sarama.v1"
)

View File

@ -18,11 +18,11 @@ import (
"context"
"encoding/json"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/syncapi/storage"
"github.com/matrix-org/dendrite/syncapi/sync"
log "github.com/sirupsen/logrus"
sarama "gopkg.in/Shopify/sarama.v1"
)

View File

@ -19,7 +19,6 @@ import (
"encoding/json"
"fmt"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/roomserver/api"
@ -27,6 +26,7 @@ import (
"github.com/matrix-org/dendrite/syncapi/sync"
"github.com/matrix-org/dendrite/syncapi/types"
"github.com/matrix-org/gomatrixserverlib"
log "github.com/sirupsen/logrus"
sarama "gopkg.in/Shopify/sarama.v1"
)

View File

@ -18,11 +18,11 @@ import (
"context"
"database/sql"
log "github.com/sirupsen/logrus"
"github.com/lib/pq"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/syncapi/types"
"github.com/matrix-org/gomatrixserverlib"
log "github.com/sirupsen/logrus"
)
const outputRoomEventsSchema = `

View File

@ -20,9 +20,9 @@ import (
"strconv"
"time"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/syncapi/types"
"github.com/matrix-org/util"
log "github.com/sirupsen/logrus"
)
const defaultSyncTimeout = time.Duration(30) * time.Second