deblan-mirror/mautrix-go
1
0
Fork 0
mirror of https://mau.dev/mautrix/go.git synced 2026-03-14 22:35:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'main' into tulir/event-auth

Browse source
This commit is contained in:
Tulir Asokan 2025-08-23 23:23:10 +03:00
commit c523ca4eee
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
federation/pdu/pdu.go
View file

@ -76,9 +76,9 @@ type PDU struct {
Unknown jsontext.Value `json:",unknown"`
// Deprecated legacy fields
DeprecatedPrevState any `json:"prev_state,omitzero"`
DeprecatedOrigin any `json:"origin,omitzero"`
DeprecatedMembership any `json:"membership,omitzero"`
DeprecatedPrevState jsontext.Value `json:"prev_state,omitzero"`
DeprecatedOrigin jsontext.Value `json:"origin,omitzero"`
DeprecatedMembership jsontext.Value `json:"membership,omitzero"`
}
var ErrPDUIsNil = errors.New("PDU is nil")

6
federation/pdu/v1.go
View file

@ -75,9 +75,9 @@ type RoomV1PDU struct {
Unknown jsontext.Value `json:",unknown"`
// Deprecated legacy fields
DeprecatedPrevState any `json:"prev_state,omitzero"`
DeprecatedOrigin any `json:"origin,omitzero"`
DeprecatedMembership any `json:"membership,omitzero"`
DeprecatedPrevState jsontext.Value `json:"prev_state,omitzero"`
DeprecatedOrigin jsontext.Value `json:"origin,omitzero"`
DeprecatedMembership jsontext.Value `json:"membership,omitzero"`
}
func (pdu *RoomV1PDU) GetRoomID() (id.RoomID, error) {