Skip to content

Commit 11b4874

Browse files
S7evinKS7evinK
committed
Fix linting
1 parent 3ca9dae commit 11b4874

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+68
-65
lines changed

‎build/dendritejs-pinecone/jsServer.go‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,16 @@ type JSServer struct {
2626

2727
// OnRequestFromJS is the function that JS will invoke when there is a new request.
2828
// The JS function signature is:
29-
// function(reqString: string): Promise<{result: string, error: string}>
29+
//
30+
// function(reqString: string): Promise<{result: string, error: string}>
31+
//
3032
// Usage is like:
31-
// const res = await global._go_js_server.fetch(reqString);
32-
// if (res.error) {
33-
// // handle error: this is a 'network' error, not a non-2xx error.
34-
// }
35-
// const rawHttpResponse = res.result;
33+
//
34+
// const res = await global._go_js_server.fetch(reqString);
35+
// if (res.error) {
36+
// // handle error: this is a 'network' error, not a non-2xx error.
37+
// }
38+
// const rawHttpResponse = res.result;
3639
func (h *JSServer) OnRequestFromJS(this js.Value, args []js.Value) interface{} {
3740
// we HAVE to spawn a new goroutine and return immediately or else Go will deadlock
3841
// if this request blocks at all e.g for /sync calls

‎clientapi/routing/admin.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"strconv"
1111
"time"
1212

13-
"github.com/gorilla/mux"
1413
"github.com/element-hq/dendrite/internal"
1514
"github.com/element-hq/dendrite/internal/eventutil"
15+
"github.com/gorilla/mux"
1616
"github.com/matrix-org/gomatrixserverlib"
1717
"github.com/matrix-org/gomatrixserverlib/spec"
1818
"github.com/matrix-org/util"

‎clientapi/routing/membership.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"net/http"
1414
"time"
1515

16-
"github.com/getsentry/sentry-go"
1716
appserviceAPI "github.com/element-hq/dendrite/appservice/api"
1817
"github.com/element-hq/dendrite/clientapi/auth/authtypes"
1918
"github.com/element-hq/dendrite/clientapi/httputil"
@@ -24,6 +23,7 @@ import (
2423
"github.com/element-hq/dendrite/roomserver/types"
2524
"github.com/element-hq/dendrite/setup/config"
2625
userapi "github.com/element-hq/dendrite/userapi/api"
26+
"github.com/getsentry/sentry-go"
2727
"github.com/matrix-org/gomatrixserverlib"
2828
"github.com/matrix-org/gomatrixserverlib/fclient"
2929
"github.com/matrix-org/gomatrixserverlib/spec"

‎clientapi/routing/room_hierarchy.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import (
1111
"strconv"
1212
"sync"
1313

14-
"github.com/google/uuid"
1514
roomserverAPI "github.com/element-hq/dendrite/roomserver/api"
1615
"github.com/element-hq/dendrite/roomserver/types"
1716
userapi "github.com/element-hq/dendrite/userapi/api"
17+
"github.com/google/uuid"
1818
"github.com/matrix-org/gomatrixserverlib/fclient"
1919
"github.com/matrix-org/gomatrixserverlib/spec"
2020
"github.com/matrix-org/util"

‎cmd/dendrite-demo-pinecone/monolith/monolith.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ import (
1818
"sync"
1919
"time"
2020

21-
"github.com/gorilla/mux"
22-
"github.com/gorilla/websocket"
2321
"github.com/element-hq/dendrite/appservice"
2422
"github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/conn"
2523
"github.com/element-hq/dendrite/cmd/dendrite-demo-pinecone/embed"
@@ -43,6 +41,8 @@ import (
4341
"github.com/element-hq/dendrite/setup/process"
4442
"github.com/element-hq/dendrite/userapi"
4543
userAPI "github.com/element-hq/dendrite/userapi/api"
44+
"github.com/gorilla/mux"
45+
"github.com/gorilla/websocket"
4646
"github.com/matrix-org/gomatrixserverlib/spec"
4747
"github.com/sirupsen/logrus"
4848

‎cmd/dendrite-demo-yggdrasil/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@ import (
1919
"path/filepath"
2020
"time"
2121

22-
"github.com/getsentry/sentry-go"
2322
"github.com/element-hq/dendrite/internal/caching"
2423
"github.com/element-hq/dendrite/internal/sqlutil"
2524
"github.com/element-hq/dendrite/setup/jetstream"
2625
"github.com/element-hq/dendrite/setup/process"
26+
"github.com/getsentry/sentry-go"
2727
"github.com/matrix-org/gomatrixserverlib"
2828
"github.com/matrix-org/gomatrixserverlib/spec"
2929

30-
"github.com/gorilla/mux"
3130
"github.com/element-hq/dendrite/appservice"
3231
"github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/embed"
3332
"github.com/element-hq/dendrite/cmd/dendrite-demo-yggdrasil/signing"
@@ -44,6 +43,7 @@ import (
4443
"github.com/element-hq/dendrite/setup/mscs"
4544
"github.com/element-hq/dendrite/test"
4645
"github.com/element-hq/dendrite/userapi"
46+
"github.com/gorilla/mux"
4747
"github.com/sirupsen/logrus"
4848
)
4949

‎cmd/dendrite/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import (
1010
"flag"
1111
"time"
1212

13-
"github.com/getsentry/sentry-go"
1413
"github.com/element-hq/dendrite/internal"
1514
"github.com/element-hq/dendrite/internal/caching"
1615
"github.com/element-hq/dendrite/internal/httputil"
1716
"github.com/element-hq/dendrite/internal/sqlutil"
1817
"github.com/element-hq/dendrite/setup/jetstream"
1918
"github.com/element-hq/dendrite/setup/process"
19+
"github.com/getsentry/sentry-go"
2020
"github.com/matrix-org/gomatrixserverlib/fclient"
2121
"github.com/prometheus/client_golang/prometheus"
2222
"github.com/sirupsen/logrus"

‎contrib/dendrite-demo-i2p/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import (
1111
"os"
1212
"time"
1313

14-
"github.com/getsentry/sentry-go"
1514
"github.com/element-hq/dendrite/internal"
1615
"github.com/element-hq/dendrite/internal/caching"
1716
"github.com/element-hq/dendrite/internal/httputil"
1817
"github.com/element-hq/dendrite/internal/sqlutil"
1918
"github.com/element-hq/dendrite/setup/jetstream"
2019
"github.com/element-hq/dendrite/setup/process"
20+
"github.com/getsentry/sentry-go"
2121
"github.com/matrix-org/gomatrixserverlib/fclient"
2222
"github.com/prometheus/client_golang/prometheus"
2323
"github.com/sirupsen/logrus"

‎contrib/dendrite-demo-i2p/main_i2p.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ import (
1919
"text/template"
2020

2121
"github.com/cretz/bine/tor"
22+
"github.com/element-hq/dendrite/internal"
23+
"github.com/element-hq/dendrite/internal/httputil"
24+
"github.com/element-hq/dendrite/setup/process"
2225
"github.com/eyedeekay/goSam"
2326
"github.com/eyedeekay/onramp"
2427
sentryhttp "github.com/getsentry/sentry-go/http"
2528
"github.com/gorilla/mux"
2629
"github.com/kardianos/minwinsvc"
27-
"github.com/element-hq/dendrite/internal"
28-
"github.com/element-hq/dendrite/internal/httputil"
29-
"github.com/element-hq/dendrite/setup/process"
3030
"github.com/prometheus/client_golang/prometheus/promhttp"
3131
"github.com/sirupsen/logrus"
3232

‎contrib/dendrite-demo-tor/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import (
1010
"os"
1111
"time"
1212

13-
"github.com/getsentry/sentry-go"
1413
"github.com/element-hq/dendrite/internal"
1514
"github.com/element-hq/dendrite/internal/caching"
1615
"github.com/element-hq/dendrite/internal/httputil"
1716
"github.com/element-hq/dendrite/internal/sqlutil"
1817
"github.com/element-hq/dendrite/setup/jetstream"
1918
"github.com/element-hq/dendrite/setup/process"
19+
"github.com/getsentry/sentry-go"
2020
"github.com/matrix-org/gomatrixserverlib/fclient"
2121
"github.com/prometheus/client_golang/prometheus"
2222
"github.com/sirupsen/logrus"

0 commit comments

Comments
 (0)