WIP

database/database.go

@@ -18,6 +18,7 @@ package database
 
 import (
 	"errors"
+	"go.mau.fi/util/dbutil"
 	"net"
 
 	"github.com/lib/pq"
@@ -25,7 +26,6 @@ import (
 	_ "github.com/mattn/go-sqlite3"
 
 	"maunium.net/go/maulogger/v2"
-	"maunium.net/go/mautrix/util/dbutil"
 
 	"github.com/beeper/groupme/database/upgrades"
 )

database/message.go

@@ -19,11 +19,11 @@ package database
 import (
 	"database/sql"
 	"errors"
+	"go.mau.fi/util/dbutil"
 	"time"
 
 	log "maunium.net/go/maulogger/v2"
 	"maunium.net/go/mautrix/id"
-	"maunium.net/go/mautrix/util/dbutil"
 
 	"github.com/beeper/groupme-lib"
 )

database/portal.go

@@ -19,12 +19,12 @@ package database
 import (
 	"database/sql"
 	"fmt"
+	"go.mau.fi/util/dbutil"
 	"strconv"
 	"strings"
 
 	log "maunium.net/go/maulogger/v2"
 	"maunium.net/go/mautrix/id"
-	"maunium.net/go/mautrix/util/dbutil"
 
 	"github.com/beeper/groupme-lib"
 )

database/puppet.go

@@ -18,11 +18,11 @@ package database
 
 import (
 	"database/sql"
+	"go.mau.fi/util/dbutil"
 
 	log "maunium.net/go/maulogger/v2"
 
 	"maunium.net/go/mautrix/id"
-	"maunium.net/go/mautrix/util/dbutil"
 
 	"github.com/beeper/groupme-lib"
 )
@@ -151,8 +151,8 @@ func (puppet *Puppet) Update() {
 	_, err := puppet.db.Exec(`
 		UPDATE puppet
 		SET displayname=$1, name_set=$2, avatar=$3, avatar_url=$4, avatar_set=$5, custom_mxid=$6,
-		access_token=$7, next_batch=$8, enable_receipts=$10
-		WHERE username=$11
+		access_token=$7, next_batch=$8, enable_receipts=$9
+		WHERE GMID=$10
 	`, puppet.Displayname, puppet.NameSet, puppet.Avatar, puppet.AvatarURL.String(), puppet.AvatarSet,
 		puppet.CustomMXID, puppet.AccessToken, puppet.NextBatch, puppet.EnableReceipts,
 		puppet.GMID)

database/reactions.go

@@ -3,12 +3,11 @@ package database
 import (
 	"database/sql"
 	"errors"
-
-	log "maunium.net/go/maulogger/v2"
-	"maunium.net/go/mautrix/id"
-	"maunium.net/go/mautrix/util/dbutil"
+	"go.mau.fi/util/dbutil"
 
 	"github.com/beeper/groupme-lib"
+	log "maunium.net/go/maulogger/v2"
+	"maunium.net/go/mautrix/id"
 )
 
 type ReactionQuery struct {

database/upgrades/upgrades.go

@@ -19,7 +19,7 @@ package upgrades
 import (
 	"embed"
 
-	"maunium.net/go/mautrix/util/dbutil"
+	"go.mau.fi/util/dbutil"
 )
 
 var Table dbutil.UpgradeTable

database/user.go

@@ -18,16 +18,15 @@ package database
 
 import (
 	"database/sql"
+	"go.mau.fi/util/dbutil"
 	"strings"
 	"sync"
 	"time"
 
 	log "maunium.net/go/maulogger/v2"
 
-	"maunium.net/go/mautrix/id"
-	"maunium.net/go/mautrix/util/dbutil"
-
 	"github.com/beeper/groupme-lib"
+	"maunium.net/go/mautrix/id"
 )
 
 type UserQuery struct {