v2: update mautrix-go

mautrix · Jul 14, 2024 · ca21d46 · ca21d46
1 parent 1e093d6
commit ca21d46
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/cmd/mautrix-signal-v2/legacyprovision.go b/cmd/mautrix-signal-v2/legacyprovision.go
@@ -237,7 +237,7 @@ func legacyResolveIdentifierOrStartChat(w http.ResponseWriter, r *http.Request,
  }
  if resp.Chat != nil {
  if resp.Chat.Portal == nil {
- resp.Chat.Portal, err = m.Bridge.GetPortalByID(r.Context(), resp.Chat.PortalID)
+ resp.Chat.Portal, err = m.Bridge.GetPortalByKey(r.Context(), resp.Chat.PortalKey)
  if err != nil {
  zerolog.Ctx(r.Context()).Err(err).Msg("Failed to get portal")
  legacyprovision.JSONResponse(w, http.StatusInternalServerError, &mautrix.RespError{

diff --git a/cmd/mautrix-signal-v2/main.go b/cmd/mautrix-signal-v2/main.go
@@ -51,7 +51,7 @@ func main() {
  20,
  "v0.5.1",
  "v0.7.0",
- m.LegacyMigrateSimple(legacyMigrateRenameTables, legacyMigrateCopyData, 9),
+ m.LegacyMigrateSimple(legacyMigrateRenameTables, legacyMigrateCopyData, 11),
  true,
  )
  }

diff --git a/database/upgrades/upgrades.go b/database/upgrades/upgrades.go
@@ -30,10 +30,10 @@ var Table dbutil.UpgradeTable
 var rawUpgrades embed.FS
 
 func init() {
- Table.Register(-1, 12, 0, "Unsupported version", false, func(ctx context.Context, database *dbutil.Database) error {
+ Table.Register(-1, 12, 0, "Unsupported version", dbutil.TxnModeOff, func(ctx context.Context, database *dbutil.Database) error {
  return errors.New("please upgrade to mautrix-signal v0.4.3 before upgrading to a newer version")
  })
- Table.Register(1, 13, 0, "Jump to version 13", false, func(ctx context.Context, database *dbutil.Database) error {
+ Table.Register(1, 13, 0, "Jump to version 13", dbutil.TxnModeOff, func(ctx context.Context, database *dbutil.Database) error {
  return nil
  })
  Table.RegisterFS(rawUpgrades)

diff --git a/go.mod b/go.mod
@@ -14,12 +14,12 @@ require (
  github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
  github.com/stretchr/testify v1.9.0
  github.com/tidwall/gjson v1.17.1
- go.mau.fi/util v0.5.1-0.20240710154926-931b33d6d530
+ go.mau.fi/util v0.5.1-0.20240714080209-e8e8154ce82a
  golang.org/x/crypto v0.25.0
  golang.org/x/exp v0.0.0-20240707233637-46b078467d37
  golang.org/x/net v0.27.0
  google.golang.org/protobuf v1.34.2
- maunium.net/go/mautrix v0.19.0-beta.1.0.20240713090952-9fdf94132a3d
+ maunium.net/go/mautrix v0.19.0-beta.1.0.20240714080619-d1905f623215
  nhooyr.io/websocket v1.8.11
 )
 

diff --git a/go.sum b/go.sum
@@ -67,8 +67,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
 github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
 github.com/yuin/goldmark v1.7.4 h1:BDXOHExt+A7gwPCJgPIIq7ENvceR7we7rOS9TNoLZeg=
 github.com/yuin/goldmark v1.7.4/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
-go.mau.fi/util v0.5.1-0.20240710154926-931b33d6d530 h1:ZWMrLC+Fn2AmKL8HM04YY0zyMDMOagQZVukpxp0rmic=
-go.mau.fi/util v0.5.1-0.20240710154926-931b33d6d530/go.mod h1:DsJzUrJAG53lCZnnYvq9/mOyLuPScWwYhvETiTrpdP4=
+go.mau.fi/util v0.5.1-0.20240714080209-e8e8154ce82a h1:m9QJacb5JfXDCdYoi/DvG4/FaHGketCSGzqys3Wyr10=
+go.mau.fi/util v0.5.1-0.20240714080209-e8e8154ce82a/go.mod h1:DsJzUrJAG53lCZnnYvq9/mOyLuPScWwYhvETiTrpdP4=
 go.mau.fi/zeroconfig v0.1.2 h1:DKOydWnhPMn65GbXZOafgkPm11BvFashZWLct0dGFto=
 go.mau.fi/zeroconfig v0.1.2/go.mod h1:NcSJkf180JT+1IId76PcMuLTNa1CzsFFZ0nBygIQM70=
 golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
@@ -93,7 +93,7 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M=
 maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA=
-maunium.net/go/mautrix v0.19.0-beta.1.0.20240713090952-9fdf94132a3d h1:Fxpvg1sOmkKKsYqbTLEIf6La9+qeBFKmnwkZfcxa8eM=
-maunium.net/go/mautrix v0.19.0-beta.1.0.20240713090952-9fdf94132a3d/go.mod h1:bNQrvIftiwJ+7OjSh+Gza5xcncq1ooHk6oyDWq4B4sg=
+maunium.net/go/mautrix v0.19.0-beta.1.0.20240714080619-d1905f623215 h1:cy3Ge8DMOQj+a6G8QhWEcg8FWsx2wEwTgSATHzg3wIE=
+maunium.net/go/mautrix v0.19.0-beta.1.0.20240714080619-d1905f623215/go.mod h1:ldNVOQXaljMk4YLzlohp+DniMQtCSzTVcwjEFBlYQLM=
 nhooyr.io/websocket v1.8.11 h1:f/qXNc2/3DpoSZkHt1DQu6rj4zGC8JmkkLkWss0MgN0=
 nhooyr.io/websocket v1.8.11/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=
diff --git a/pkg/connector/chatinfo.go b/pkg/connector/chatinfo.go
@@ -234,7 +234,7 @@ func (s *SignalClient) makeCreateDMResponse(recipient *types.Recipient) *bridgev
  serviceID = libsignalgo.NewACIServiceID(recipient.ACI)
  }
  return &bridgev2.CreateChatResponse{
- PortalID: s.makeDMPortalKey(serviceID),
+ PortalKey: s.makeDMPortalKey(serviceID),
  PortalInfo: &bridgev2.ChatInfo{
  Name: &name,
  Avatar: avatar,

diff --git a/pkg/signalmeow/store/upgrades/16-remove-extra-prekeys.go b/pkg/signalmeow/store/upgrades/16-remove-extra-prekeys.go
@@ -59,7 +59,7 @@ func deleteExtraPrekeys(ctx context.Context, db *dbutil.Database, selectQuery, d
 }
 
 func init() {
- Table.Register(-1, 16, 13, "Remove extra prekeys", true, func(ctx context.Context, db *dbutil.Database) error {
+ Table.Register(-1, 16, 13, "Remove extra prekeys", dbutil.TxnModeOn, func(ctx context.Context, db *dbutil.Database) error {
  err := deleteExtraPrekeys(ctx, db, `
  SELECT account_id, service_id, COUNT(*), MAX(key_id) FROM signalmeow_pre_keys WHERE is_signed=false GROUP BY 1, 2
  `, `