From 653151f69f3b3085dd4ee4a6c21c8709fa6d87f5 Mon Sep 17 00:00:00 2001 From: Devon Hudson Date: Fri, 12 May 2023 12:24:23 -0600 Subject: [PATCH] Remove custom type for matrix event type strings --- federationapi/routing/join.go | 2 +- go.mod | 2 +- go.sum | 2 ++ roomserver/api/api.go | 2 +- roomserver/internal/query/query.go | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/federationapi/routing/join.go b/federationapi/routing/join.go index 220292abc..4134302d8 100644 --- a/federationapi/routing/join.go +++ b/federationapi/routing/join.go @@ -51,7 +51,7 @@ func (rq *JoinRoomQuerier) RoomInfo(ctx context.Context, roomID spec.RoomID) (*g return result, err } -func (rq *JoinRoomQuerier) StateEvent(ctx context.Context, roomID spec.RoomID, eventType spec.MatrixEventType, stateKey string) (gomatrixserverlib.PDU, error) { +func (rq *JoinRoomQuerier) StateEvent(ctx context.Context, roomID spec.RoomID, eventType string, stateKey string) (gomatrixserverlib.PDU, error) { return rq.roomserver.GetStateEvent(ctx, roomID, eventType, stateKey) } diff --git a/go.mod b/go.mod index c9b39275b..68edc1b3b 100644 --- a/go.mod +++ b/go.mod @@ -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-20230512163742-2313af9fcc17 + github.com/matrix-org/gomatrixserverlib v0.0.0-20230512181907-b7d5ff20f1ff 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 diff --git a/go.sum b/go.sum index 977942fad..f7a497a07 100644 --- a/go.sum +++ b/go.sum @@ -327,6 +327,8 @@ github.com/matrix-org/gomatrixserverlib v0.0.0-20230512162258-bdb2e94f6b1f h1:IU github.com/matrix-org/gomatrixserverlib v0.0.0-20230512162258-bdb2e94f6b1f/go.mod h1:H9V9N3Uqn1bBJqYJNGK1noqtgJTaCEhtTdcH/mp50uU= github.com/matrix-org/gomatrixserverlib v0.0.0-20230512163742-2313af9fcc17 h1:2QpV8ZfvPKgT2mks8vWnu1z3bjU2jT7ya0E4j67/xc4= github.com/matrix-org/gomatrixserverlib v0.0.0-20230512163742-2313af9fcc17/go.mod h1:H9V9N3Uqn1bBJqYJNGK1noqtgJTaCEhtTdcH/mp50uU= +github.com/matrix-org/gomatrixserverlib v0.0.0-20230512181907-b7d5ff20f1ff h1:bAHc5BTjl7BngJgB40QFVGTqWYhOxuFNGtxchlAZChU= +github.com/matrix-org/gomatrixserverlib v0.0.0-20230512181907-b7d5ff20f1ff/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= diff --git a/roomserver/api/api.go b/roomserver/api/api.go index 8979ba7f3..c0e0fc6c8 100644 --- a/roomserver/api/api.go +++ b/roomserver/api/api.go @@ -228,7 +228,7 @@ type FederationRoomserverAPI interface { IsInvitePending(ctx context.Context, roomID spec.RoomID, userID spec.UserID) (bool, error) QueryRoomInfo(ctx context.Context, roomID spec.RoomID) (*types.RoomInfo, error) - GetStateEvent(ctx context.Context, roomID spec.RoomID, eventType spec.MatrixEventType, stateKey string) (gomatrixserverlib.PDU, error) + GetStateEvent(ctx context.Context, roomID spec.RoomID, eventType string, stateKey string) (gomatrixserverlib.PDU, error) UserJoinedToRoom(ctx context.Context, roomID types.RoomNID, userID spec.UserID) (bool, error) GetLocallyJoinedUsers(ctx context.Context, roomVersion gomatrixserverlib.RoomVersion, roomNID types.RoomNID) ([]gomatrixserverlib.PDU, error) } diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go index 05d14f0b6..f7d32cf15 100644 --- a/roomserver/internal/query/query.go +++ b/roomserver/internal/query/query.go @@ -867,7 +867,7 @@ func (r *Queryer) QueryRoomInfo(ctx context.Context, roomID spec.RoomID) (*types return r.DB.RoomInfo(ctx, roomID.String()) } -func (r *Queryer) GetStateEvent(ctx context.Context, roomID spec.RoomID, eventType spec.MatrixEventType, stateKey string) (gomatrixserverlib.PDU, error) { +func (r *Queryer) GetStateEvent(ctx context.Context, roomID spec.RoomID, eventType string, stateKey string) (gomatrixserverlib.PDU, error) { return r.DB.GetStateEvent(ctx, roomID.String(), string(eventType), "") }