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

Use net.maunium.reply instead of m.reference as fake reply relation type

Browse source
This commit is contained in:
Tulir Asokan 2020-10-27 00:42:53 +02:00
commit 3af22dc542
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
event/relations.go
View file

@ -18,6 +18,7 @@ const (
RelReplace RelationType = "m.replace"
RelReference RelationType = "m.reference"
RelAnnotation RelationType = "m.annotation"
RelReply RelationType = "net.maunium.reply"
)
type RelatesTo struct {
@ -51,6 +52,14 @@ func (rel *RelatesTo) GetReferenceID() id.EventID {
}
return ""
}
func (rel *RelatesTo) GetReplyID() id.EventID {
if rel.Type == RelReply {
return rel.EventID
}
return ""
}
func (rel *RelatesTo) GetAnnotationID() id.EventID {
if rel.Type == RelAnnotation {
return rel.EventID
@ -75,7 +84,7 @@ func (rel *RelatesTo) UnmarshalJSON(data []byte) error {
rel.EventID = srel.EventID
rel.Key = srel.Key
} else if srel.InReplyTo != nil && len(srel.InReplyTo.EventID) > 0 {
rel.Type = RelReference
rel.Type = RelReply
rel.EventID = srel.InReplyTo.EventID
rel.Key = ""
}
@ -84,7 +93,7 @@ func (rel *RelatesTo) UnmarshalJSON(data []byte) error {
func (rel *RelatesTo) MarshalJSON() ([]byte, error) {
srel := serializableRelatesTo{Type: rel.Type, EventID: rel.EventID, Key: rel.Key}
if rel.Type == RelReference {
if rel.Type == RelReply {
srel.InReplyTo = &serializableInReplyTo{rel.EventID}
}
return json.Marshal(&srel)

4
event/reply.go
View file

@ -45,7 +45,7 @@ func (content *MessageEventContent) RemoveReplyFallback() {
}
func (content *MessageEventContent) GetReplyTo() id.EventID {
if content.RelatesTo != nil && content.RelatesTo.Type == RelReference {
if content.RelatesTo != nil && content.RelatesTo.Type == RelReply {
return content.RelatesTo.EventID
}
return ""
@ -93,7 +93,7 @@ func (evt *Event) GenerateReplyFallbackText() string {
func (content *MessageEventContent) SetReply(inReplyTo *Event) {
content.RelatesTo = &RelatesTo{
EventID: inReplyTo.ID,
Type: RelReference,
Type: RelReply,
}
if content.MsgType == MsgText || content.MsgType == MsgNotice {