vbatts/maubot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Small fixes

Browse source
This commit is contained in:
Tulir Asokan 2018-06-14 13:36:53 +03:00
parent 3a27831112
commit feaf75b327
5 changed files with 53 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
matrix/event.go
View file

@ -65,6 +65,10 @@ func (evt *Event) Interface() *maubot.Event {
return mbEvent
}
func (evt *Event) MarkRead() error {
return evt.Client.MarkRead(evt.RoomID, evt.ID)
}
func (evt *Event) Reply(text string) (string, error) {
return evt.SendRawEvent(maubot.EventMessage,
SetReply(

16
matrix/matrix.go
View file

@ -57,7 +57,21 @@ func (client *Client) ParseEvent(evt *gomatrix.Event) *Event {
}
func (client *Client) AddEventHandler(evt maubot.EventType, handler maubot.EventHandler) {
client.syncer.OnEventType(evt, handler)
client.syncer.OnEventType(evt, func(evt *maubot.Event) bool {
if evt.Sender == client.UserID {
return false
}
return handler(evt)
})
}
func (client *Client) GetEvent(roomID, eventID string) *maubot.Event {
evt, err := client.Client.GetEvent(roomID, eventID)
if err != nil {
log.Warnf("Failed to get event %s @ %s: %v", eventID, roomID, err)
return nil
}
return client.ParseEvent(evt).Interface()
}
func (client *Client) onJoin(evt *maubot.Event) bool {

2
matrix/replyutil.go
View file

@ -41,7 +41,7 @@ func TrimReplyFallbackText(text string) string {
for len(lines) > 0 && strings.HasPrefix(lines[0], "> ") {
lines = lines[1:]
}
return strings.Join(lines, "\n")
return strings.TrimSpace(strings.Join(lines, "\n"))
}
func RemoveReplyFallback(evt *maubot.Event) {