Skip to content
This repository was archived by the owner on Nov 25, 2024. It is now read-only.

Commit 72285b2

Browse files
kegsaykegsay
authored
refactor: update GMSL (#3058)
Sister PR to matrix-org/gomatrixserverlib#364 Read this commit by commit to avoid going insane.
1 parent 9fa3926 commit 72285b2

File tree

306 files changed

+2120
-1937
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

306 files changed

+2120
-1937
lines changed

‎appservice/appservice.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ import (
2020

2121
"github.com/matrix-org/dendrite/setup/jetstream"
2222
"github.com/matrix-org/dendrite/setup/process"
23+
"github.com/matrix-org/gomatrixserverlib/spec"
2324
"github.com/sirupsen/logrus"
2425

25-
"github.com/matrix-org/gomatrixserverlib"
26-
2726
appserviceAPI "github.com/matrix-org/dendrite/appservice/api"
2827
"github.com/matrix-org/dendrite/appservice/consumers"
2928
"github.com/matrix-org/dendrite/appservice/query"
@@ -86,7 +85,7 @@ func NewInternalAPI(
8685
func generateAppServiceAccount(
8786
userAPI userapi.AppserviceUserAPI,
8887
as config.ApplicationService,
89-
serverName gomatrixserverlib.ServerName,
88+
serverName spec.ServerName,
9089
) error {
9190
var accRes userapi.PerformAccountCreationResponse
9291
err := userAPI.PerformAccountCreation(context.Background(), &userapi.PerformAccountCreationRequest{

‎appservice/appservice_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/matrix-org/dendrite/setup/jetstream"
2828
"github.com/matrix-org/dendrite/test"
2929
"github.com/matrix-org/dendrite/userapi"
30-
"github.com/matrix-org/gomatrixserverlib"
30+
"github.com/matrix-org/gomatrixserverlib/spec"
3131

3232
"github.com/matrix-org/dendrite/test/testrig"
3333
)
@@ -326,7 +326,7 @@ func TestRoomserverConsumerOneInvite(t *testing.T) {
326326
room := test.NewRoom(t, alice)
327327

328328
// Invite Bob
329-
room.CreateAndInsert(t, alice, gomatrixserverlib.MRoomMember, map[string]interface{}{
329+
room.CreateAndInsert(t, alice, spec.MRoomMember, map[string]interface{}{
330330
"membership": "invite",
331331
}, test.WithStateKey(bob.ID))
332332

@@ -345,7 +345,7 @@ func TestRoomserverConsumerOneInvite(t *testing.T) {
345345
t.Fatal(err)
346346
}
347347
for _, ev := range txn.Events {
348-
if ev.Type != gomatrixserverlib.MRoomMember {
348+
if ev.Type != spec.MRoomMember {
349349
continue
350350
}
351351
// Usually we would check the event content for the membership, but since

‎appservice/consumers/roomserver.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"time"
2727

2828
"github.com/matrix-org/gomatrixserverlib"
29+
"github.com/matrix-org/gomatrixserverlib/spec"
2930
"github.com/nats-io/nats.go"
3031

3132
"github.com/matrix-org/dendrite/roomserver/api"
@@ -240,7 +241,7 @@ func (s *OutputRoomEventConsumer) appserviceIsInterestedInEvent(ctx context.Cont
240241
return true
241242
}
242243

243-
if event.Type() == gomatrixserverlib.MRoomMember && event.StateKey() != nil {
244+
if event.Type() == spec.MRoomMember && event.StateKey() != nil {
244245
if appservice.IsInterestedInUserID(*event.StateKey()) {
245246
return true
246247
}
@@ -286,15 +287,15 @@ func (s *OutputRoomEventConsumer) appserviceJoinedAtEvent(ctx context.Context, e
286287
switch {
287288
case ev.StateKey == nil:
288289
continue
289-
case ev.Type != gomatrixserverlib.MRoomMember:
290+
case ev.Type != spec.MRoomMember:
290291
continue
291292
}
292293
var membership gomatrixserverlib.MemberContent
293294
err = json.Unmarshal(ev.Content, &membership)
294295
switch {
295296
case err != nil:
296297
continue
297-
case membership.Membership == gomatrixserverlib.Join:
298+
case membership.Membership == spec.Join:
298299
if appservice.IsInterestedInUserID(*ev.StateKey) {
299300
return true
300301
}

‎build/dendritejs-pinecone/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func startup() {
171171
cfg.Global.TrustedIDServers = []string{}
172172
cfg.Global.KeyID = gomatrixserverlib.KeyID(signing.KeyID)
173173
cfg.Global.PrivateKey = sk
174-
cfg.Global.ServerName = gomatrixserverlib.ServerName(hex.EncodeToString(pk))
174+
cfg.Global.ServerName = spec.ServerName(hex.EncodeToString(pk))
175175
cfg.ClientAPI.RegistrationDisabled = false
176176
cfg.ClientAPI.OpenRegistrationWithoutVerificationEnabled = true
177177

‎build/gobind-pinecone/monolith.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
"github.com/matrix-org/dendrite/setup/process"
3636
userapiAPI "github.com/matrix-org/dendrite/userapi/api"
3737
"github.com/matrix-org/gomatrixserverlib"
38+
"github.com/matrix-org/gomatrixserverlib/spec"
3839
"github.com/matrix-org/pinecone/types"
3940
"github.com/sirupsen/logrus"
4041

@@ -140,9 +141,9 @@ func (m *DendriteMonolith) SetStaticPeer(uri string) {
140141
}
141142
}
142143

143-
func getServerKeyFromString(nodeID string) (gomatrixserverlib.ServerName, error) {
144-
var nodeKey gomatrixserverlib.ServerName
145-
if userID, err := gomatrixserverlib.NewUserID(nodeID, false); err == nil {
144+
func getServerKeyFromString(nodeID string) (spec.ServerName, error) {
145+
var nodeKey spec.ServerName
146+
if userID, err := spec.NewUserID(nodeID, false); err == nil {
146147
hexKey, decodeErr := hex.DecodeString(string(userID.Domain()))
147148
if decodeErr != nil || len(hexKey) != ed25519.PublicKeySize {
148149
return "", fmt.Errorf("UserID domain is not a valid ed25519 public key: %v", userID.Domain())
@@ -154,15 +155,15 @@ func getServerKeyFromString(nodeID string) (gomatrixserverlib.ServerName, error)
154155
if decodeErr != nil || len(hexKey) != ed25519.PublicKeySize {
155156
return "", fmt.Errorf("Relay server uri is not a valid ed25519 public key: %v", nodeID)
156157
} else {
157-
nodeKey = gomatrixserverlib.ServerName(nodeID)
158+
nodeKey = spec.ServerName(nodeID)
158159
}
159160
}
160161

161162
return nodeKey, nil
162163
}
163164

164165
func (m *DendriteMonolith) SetRelayServers(nodeID string, uris string) {
165-
relays := []gomatrixserverlib.ServerName{}
166+
relays := []spec.ServerName{}
166167
for _, uri := range strings.Split(uris, ",") {
167168
uri = strings.TrimSpace(uri)
168169
if len(uri) == 0 {
@@ -188,7 +189,7 @@ func (m *DendriteMonolith) SetRelayServers(nodeID string, uris string) {
188189
m.p2pMonolith.RelayRetriever.SetRelayServers(relays)
189190
} else {
190191
relay.UpdateNodeRelayServers(
191-
gomatrixserverlib.ServerName(nodeKey),
192+
spec.ServerName(nodeKey),
192193
relays,
193194
m.p2pMonolith.ProcessCtx.Context(),
194195
m.p2pMonolith.GetFederationAPI(),
@@ -215,7 +216,7 @@ func (m *DendriteMonolith) GetRelayServers(nodeID string) string {
215216
relaysString += string(relay)
216217
}
217218
} else {
218-
request := api.P2PQueryRelayServersRequest{Server: gomatrixserverlib.ServerName(nodeKey)}
219+
request := api.P2PQueryRelayServersRequest{Server: spec.ServerName(nodeKey)}
219220
response := api.P2PQueryRelayServersResponse{}
220221
err := m.p2pMonolith.GetFederationAPI().P2PQueryRelayServers(m.p2pMonolith.ProcessCtx.Context(), &request, &response)
221222
if err != nil {
@@ -291,7 +292,7 @@ func (m *DendriteMonolith) RegisterUser(localpart, password string) (string, err
291292
pubkey := m.p2pMonolith.Router.PublicKey()
292293
userID := userutil.MakeUserID(
293294
localpart,
294-
gomatrixserverlib.ServerName(hex.EncodeToString(pubkey[:])),
295+
spec.ServerName(hex.EncodeToString(pubkey[:])),
295296
)
296297
userReq := &userapiAPI.PerformAccountCreationRequest{
297298
AccountType: userapiAPI.AccountTypeUser,
@@ -342,7 +343,7 @@ func (m *DendriteMonolith) Start() {
342343

343344
prefix := hex.EncodeToString(pk)
344345
cfg := monolith.GenerateDefaultConfig(sk, m.StorageDirectory, m.CacheDirectory, prefix)
345-
cfg.Global.ServerName = gomatrixserverlib.ServerName(hex.EncodeToString(pk))
346+
cfg.Global.ServerName = spec.ServerName(hex.EncodeToString(pk))
346347
cfg.Global.KeyID = gomatrixserverlib.KeyID(signing.KeyID)
347348
cfg.Global.JetStream.InMemory = false
348349
// NOTE : disabled for now since there is a 64 bit alignment panic on 32 bit systems

‎build/gobind-pinecone/monolith_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"strings"
1919
"testing"
2020

21-
"github.com/matrix-org/gomatrixserverlib"
21+
"github.com/matrix-org/gomatrixserverlib/spec"
2222
)
2323

2424
func TestMonolithStarts(t *testing.T) {
@@ -110,7 +110,7 @@ func TestParseServerKey(t *testing.T) {
110110
name string
111111
serverKey string
112112
expectedErr bool
113-
expectedKey gomatrixserverlib.ServerName
113+
expectedKey spec.ServerName
114114
}{
115115
{
116116
name: "valid userid as key",

‎build/gobind-yggdrasil/monolith.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"github.com/matrix-org/dendrite/test"
3434
"github.com/matrix-org/dendrite/userapi"
3535
"github.com/matrix-org/gomatrixserverlib"
36+
"github.com/matrix-org/gomatrixserverlib/spec"
3637
"github.com/sirupsen/logrus"
3738

3839
_ "golang.org/x/mobile/bind"
@@ -134,7 +135,7 @@ func (m *DendriteMonolith) Start() {
134135
Generate: true,
135136
SingleDatabase: true,
136137
})
137-
cfg.Global.ServerName = gomatrixserverlib.ServerName(hex.EncodeToString(pk))
138+
cfg.Global.ServerName = spec.ServerName(hex.EncodeToString(pk))
138139
cfg.Global.PrivateKey = sk
139140
cfg.Global.KeyID = gomatrixserverlib.KeyID(signing.KeyID)
140141
cfg.Global.JetStream.StoragePath = config.Path(fmt.Sprintf("%s/", m.StorageDirectory))

‎clientapi/admin_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"github.com/matrix-org/dendrite/setup/config"
1919
"github.com/matrix-org/dendrite/setup/jetstream"
2020
"github.com/matrix-org/dendrite/syncapi"
21-
"github.com/matrix-org/gomatrixserverlib"
2221
"github.com/matrix-org/gomatrixserverlib/fclient"
22+
"github.com/matrix-org/gomatrixserverlib/spec"
2323
"github.com/matrix-org/util"
2424
"github.com/tidwall/gjson"
2525

@@ -123,7 +123,7 @@ func TestPurgeRoom(t *testing.T) {
123123
room := test.NewRoom(t, aliceAdmin, test.RoomPreset(test.PresetTrustedPrivateChat))
124124

125125
// Invite Bob
126-
room.CreateAndInsert(t, aliceAdmin, gomatrixserverlib.MRoomMember, map[string]interface{}{
126+
room.CreateAndInsert(t, aliceAdmin, spec.MRoomMember, map[string]interface{}{
127127
"membership": "invite",
128128
}, test.WithStateKey(bob.ID))
129129

@@ -194,7 +194,7 @@ func TestAdminEvacuateRoom(t *testing.T) {
194194
room := test.NewRoom(t, aliceAdmin)
195195

196196
// Join Bob
197-
room.CreateAndInsert(t, bob, gomatrixserverlib.MRoomMember, map[string]interface{}{
197+
room.CreateAndInsert(t, bob, spec.MRoomMember, map[string]interface{}{
198198
"membership": "join",
199199
}, test.WithStateKey(bob.ID))
200200

@@ -291,10 +291,10 @@ func TestAdminEvacuateUser(t *testing.T) {
291291
room2 := test.NewRoom(t, aliceAdmin)
292292

293293
// Join Bob
294-
room.CreateAndInsert(t, bob, gomatrixserverlib.MRoomMember, map[string]interface{}{
294+
room.CreateAndInsert(t, bob, spec.MRoomMember, map[string]interface{}{
295295
"membership": "join",
296296
}, test.WithStateKey(bob.ID))
297-
room2.CreateAndInsert(t, bob, gomatrixserverlib.MRoomMember, map[string]interface{}{
297+
room2.CreateAndInsert(t, bob, spec.MRoomMember, map[string]interface{}{
298298
"membership": "join",
299299
}, test.WithStateKey(bob.ID))
300300

‎clientapi/auth/user_interactive_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import (
88

99
"github.com/matrix-org/dendrite/setup/config"
1010
"github.com/matrix-org/dendrite/userapi/api"
11-
"github.com/matrix-org/gomatrixserverlib"
1211
"github.com/matrix-org/gomatrixserverlib/fclient"
12+
"github.com/matrix-org/gomatrixserverlib/spec"
1313
"github.com/matrix-org/util"
1414
)
1515

1616
var (
1717
ctx = context.Background()
18-
serverName = gomatrixserverlib.ServerName("example.com")
18+
serverName = spec.ServerName("example.com")
1919
// space separated localpart+password -> account
2020
lookup = make(map[string]*api.Account)
2121
device = &api.Device{

‎clientapi/producers/syncapi.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"time"
2323

2424
"github.com/matrix-org/gomatrixserverlib"
25+
"github.com/matrix-org/gomatrixserverlib/spec"
2526
"github.com/nats-io/nats.go"
2627
log "github.com/sirupsen/logrus"
2728

@@ -37,13 +38,13 @@ type SyncAPIProducer struct {
3738
TopicTypingEvent string
3839
TopicPresenceEvent string
3940
JetStream nats.JetStreamContext
40-
ServerName gomatrixserverlib.ServerName
41+
ServerName spec.ServerName
4142
UserAPI userapi.ClientUserAPI
4243
}
4344

4445
func (p *SyncAPIProducer) SendReceipt(
4546
ctx context.Context,
46-
userID, roomID, eventID, receiptType string, timestamp gomatrixserverlib.Timestamp,
47+
userID, roomID, eventID, receiptType string, timestamp spec.Timestamp,
4748
) error {
4849
m := &nats.Msg{
4950
Subject: p.TopicReceiptEvent,
@@ -154,7 +155,7 @@ func (p *SyncAPIProducer) SendPresence(
154155
m.Header.Set("status_msg", *statusMsg)
155156
}
156157

157-
m.Header.Set("last_active_ts", strconv.Itoa(int(gomatrixserverlib.AsTimestamp(time.Now()))))
158+
m.Header.Set("last_active_ts", strconv.Itoa(int(spec.AsTimestamp(time.Now()))))
158159

159160
_, err := p.JetStream.PublishMsg(m, nats.Context(ctx))
160161
return err

0 commit comments

Comments
 (0)