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

Use gomatrixserverlib method

Browse source
This commit is contained in:
Brendan Abolivier 2017-07-24 13:59:33 +01:00
parent 05c2dc886e
commit 8b708d4c41
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
2 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/github.com/matrix-org/dendrite/syncapi/consumers/roomserver.go
View file

@ -226,18 +226,6 @@ func (s *OutputRoomEvent) updateMemberEvent(
return event, nil
}
builder := gomatrixserverlib.EventBuilder{
Sender: event.Sender(),
RoomID: event.RoomID(),
Type: event.Type(),
StateKey: event.StateKey(),
PrevEvents: event.PrevEvents(),
AuthEvents: event.AuthEvents(),
Redacts: event.Redacts(),
Depth: event.Depth(),
Content: event.Content(),
}
var content events.MemberContent
if err := json.Unmarshal(prevEvent.Content(), &content); err != nil {
return event, err
@ -249,14 +237,7 @@ func (s *OutputRoomEvent) updateMemberEvent(
UserID: prevEvent.Sender(),
}
if err = builder.SetUnsigned(prev); err != nil {
return event, err
}
ts := event.OriginServerTS().Time()
ev, err := builder.Build(event.EventID(), ts, event.Origin(), keyID, privateKey)
return ev, err
return event.SetUnsigned(prev)
}
func missingEventsFrom(events []gomatrixserverlib.Event, required []string) []string {

2
src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go
View file

@ -100,8 +100,6 @@ func (d *SyncServerDatabase) WriteEvent(
}
streamPos = types.StreamPosition(pos)
fmt.Println(len(addStateEvents))
if len(addStateEvents) == 0 {
// If the event is a m.room.member event, and has unsigned content,
// we need to save it as it is very likely to be a membership update