mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-12 00:23:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use Base64FromEventID to get the Base64Bytes

Browse source
This commit is contained in:
Till Faelligen 2023-05-17 17:40:15 +02:00
parent 09a571c8e3
commit 7270ca9cc7
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clientapi/routing/createroom.go
View file

@ -470,7 +470,7 @@ func createRoom(
}
}
if i > 0 {
builder.PrevEvents = []gomatrixserverlib.EventReference{{EventID: builtEvents[i-1].EventID(), EventSHA256: spec.Base64Bytes(builtEvents[i-1].EventID())}}
builder.PrevEvents = []gomatrixserverlib.EventReference{{EventID: builtEvents[i-1].EventID(), EventSHA256: spec.Base64FromEventID(builtEvents[i-1].EventID())}}
}
var ev gomatrixserverlib.PDU
if err = builder.AddAuthEvents(&authEvents); err != nil {

2
go.mod
View file

@ -22,7 +22,7 @@ require (
github.com/matrix-org/dugong v0.0.0-20210921133753-66e6b1c67e2e
github.com/matrix-org/go-sqlite3-js v0.0.0-20220419092513-28aa791a1c91
github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530
github.com/matrix-org/gomatrixserverlib v0.0.0-20230517075425-02375c939cef
github.com/matrix-org/gomatrixserverlib v0.0.0-20230517153345-09eef2ea3284
github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a
github.com/matrix-org/util v0.0.0-20221111132719-399730281e66
github.com/mattn/go-sqlite3 v1.14.16

4
go.sum
View file

@ -323,8 +323,8 @@ github.com/matrix-org/go-sqlite3-js v0.0.0-20220419092513-28aa791a1c91 h1:s7fexw
github.com/matrix-org/go-sqlite3-js v0.0.0-20220419092513-28aa791a1c91/go.mod h1:e+cg2q7C7yE5QnAXgzo512tgFh1RbQLC0+jozuegKgo=
github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530 h1:kHKxCOLcHH8r4Fzarl4+Y3K5hjothkVW5z7T1dUM11U=
github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530/go.mod h1:/gBX06Kw0exX1HrwmoBibFA98yBk/jxKpGVeyQbff+s=
github.com/matrix-org/gomatrixserverlib v0.0.0-20230517075425-02375c939cef h1:WASuSaFyDMHVtLWI+6Nkl0VWs16gm8hHzx5hUkF4MlU=
github.com/matrix-org/gomatrixserverlib v0.0.0-20230517075425-02375c939cef/go.mod h1:H9V9N3Uqn1bBJqYJNGK1noqtgJTaCEhtTdcH/mp50uU=
github.com/matrix-org/gomatrixserverlib v0.0.0-20230517153345-09eef2ea3284 h1:1FF34lMBtSQgfBrbBTtP51czFGcTgxM6Yx9LaSjmiQY=
github.com/matrix-org/gomatrixserverlib v0.0.0-20230517153345-09eef2ea3284/go.mod h1:H9V9N3Uqn1bBJqYJNGK1noqtgJTaCEhtTdcH/mp50uU=
github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a h1:awrPDf9LEFySxTLKYBMCiObelNx/cBuv/wzllvCCH3A=
github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a/go.mod h1:HchJX9oKMXaT2xYFs0Ha/6Zs06mxLU8k6F1ODnrGkeQ=
github.com/matrix-org/util v0.0.0-20221111132719-399730281e66 h1:6z4KxomXSIGWqhHcfzExgkH3Z3UkIXry4ibJS4Aqz2Y=

2
roomserver/internal/input/input_events.go
View file

@ -884,7 +884,7 @@ func (r *Inputer) kickGuests(ctx context.Context, event gomatrixserverlib.PDU, r
SendAsServer: string(senderDomain),
})
prevEvents = []gomatrixserverlib.EventReference{
{EventID: event.EventID(), EventSHA256: spec.Base64Bytes(event.EventID())},
{EventID: event.EventID(), EventSHA256: spec.Base64FromEventID(event.EventID())},
}
}

2
roomserver/internal/perform/perform_admin.go
View file

@ -132,7 +132,7 @@ func (r *Admin) PerformAdminEvacuateRoom(
})
affected = append(affected, stateKey)
prevEvents = []gomatrixserverlib.EventReference{
{EventID: event.EventID(), EventSHA256: spec.Base64Bytes(event.EventID())},
{EventID: event.EventID(), EventSHA256: spec.Base64FromEventID(event.EventID())},
}
}

2
roomserver/internal/perform/perform_upgrade.go
View file

@ -471,7 +471,7 @@ func (r *Upgrader) sendInitialEvents(ctx context.Context, evTime time.Time, user
return fmt.Errorf("failed to set content of new %q event: %w", proto.Type, err)
}
if i > 0 {
proto.PrevEvents = []gomatrixserverlib.EventReference{{EventID: builtEvents[i-1].EventID(), EventSHA256: spec.Base64Bytes(builtEvents[i-1].EventID())}}
proto.PrevEvents = []gomatrixserverlib.EventReference{{EventID: builtEvents[i-1].EventID(), EventSHA256: spec.Base64FromEventID(builtEvents[i-1].EventID())}}
}
var verImpl gomatrixserverlib.IRoomVersion

2
test/room.go
View file

@ -176,7 +176,7 @@ func (r *Room) CreateEvent(t *testing.T, creator *User, eventType string, conten
t.Fatalf("CreateEvent[%s]: failed to SetContent: %s", eventType, err)
}
if depth > 1 {
builder.PrevEvents = []gomatrixserverlib.EventReference{{EventSHA256: spec.Base64Bytes(r.events[len(r.events)-1].EventID()), EventID: r.events[len(r.events)-1].EventID()}}
builder.PrevEvents = []gomatrixserverlib.EventReference{{EventSHA256: spec.Base64FromEventID(r.events[len(r.events)-1].EventID()), EventID: r.events[len(r.events)-1].EventID()}}
}
err = builder.AddAuthEvents(&r.authEvents)