Fix import ordering

mautrix · Dec 31, 2023 · 35b1f06 · 35b1f06
1 parent bdb3258
commit 35b1f06
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 15 deletions.
diff --git a/database/database.go b/database/database.go
@@ -21,7 +21,6 @@ import (
 
  _ "github.com/lib/pq"
  _ "github.com/mattn/go-sqlite3"
-
  "go.mau.fi/util/dbutil"
 
  "go.mau.fi/mautrix-signal/database/upgrades"

diff --git a/database/disappearingmessage.go b/database/disappearingmessage.go
@@ -22,7 +22,6 @@ import (
  "time"
 
  "go.mau.fi/util/dbutil"
-
  "maunium.net/go/mautrix/id"
 )
 

diff --git a/database/message.go b/database/message.go
@@ -22,9 +22,8 @@ import (
  "strings"
 
  "github.com/google/uuid"
- "maunium.net/go/mautrix/id"
-
  "go.mau.fi/util/dbutil"
+ "maunium.net/go/mautrix/id"
 )
 
 const (

diff --git a/database/portal.go b/database/portal.go
@@ -21,9 +21,8 @@ import (
  "database/sql"
 
  "github.com/google/uuid"
- "maunium.net/go/mautrix/id"
-
  "go.mau.fi/util/dbutil"
+ "maunium.net/go/mautrix/id"
 
  "go.mau.fi/mautrix-signal/pkg/signalmeow"
 )

diff --git a/database/puppet.go b/database/puppet.go
@@ -21,9 +21,8 @@ import (
  "database/sql"
 
  "github.com/google/uuid"
- "maunium.net/go/mautrix/id"
-
  "go.mau.fi/util/dbutil"
+ "maunium.net/go/mautrix/id"
 )
 
 const (

diff --git a/database/reaction.go b/database/reaction.go
@@ -20,9 +20,8 @@ import (
  "context"
 
  "github.com/google/uuid"
- "maunium.net/go/mautrix/id"
-
  "go.mau.fi/util/dbutil"
+ "maunium.net/go/mautrix/id"
 )
 
 const (

diff --git a/database/user.go b/database/user.go
@@ -21,9 +21,8 @@ import (
  "database/sql"
 
  "github.com/google/uuid"
- "maunium.net/go/mautrix/id"
-
  "go.mau.fi/util/dbutil"
+ "maunium.net/go/mautrix/id"
 )
 
 const (

diff --git a/main.go b/main.go
@@ -25,16 +25,15 @@ import (
 
  "github.com/google/uuid"
  "github.com/rs/zerolog"
+ "go.mau.fi/util/configupgrade"
+ "go.mau.fi/util/dbutil"
  "maunium.net/go/mautrix"
  "maunium.net/go/mautrix/bridge"
  "maunium.net/go/mautrix/bridge/commands"
  "maunium.net/go/mautrix/event"
  "maunium.net/go/mautrix/format"
  "maunium.net/go/mautrix/id"
 
- "go.mau.fi/util/configupgrade"
- "go.mau.fi/util/dbutil"
-
  "go.mau.fi/mautrix-signal/config"
  "go.mau.fi/mautrix-signal/database"
  "go.mau.fi/mautrix-signal/msgconv/matrixfmt"