astra
/
go-mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #67 from mattn/fix-66 

fix #66
pull/69/head
mattn 2017-11-20 10:11:47 +09:00 committed by GitHub
parent bd72aa305d 81259792b7
commit 0a6f156537
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
streaming.go
View File

@ -69,7 +69,7 @@ func handleReader(q chan Event, r io.Reader) error {
q <- &NotificationEvent{&notification} q <- &NotificationEvent{&notification}
} }
case "delete": case "delete":
q <- &DeleteEvent{ID(strings.TrimSpace(token[1]))} q <- &DeleteEvent{ID: ID(strings.TrimSpace(token[1]))}
} }
if err != nil { if err != nil {
q <- &ErrorEvent{err} q <- &ErrorEvent{err}

7
streaming_ws.go
View File

@ -6,6 +6,7 @@ import (
"fmt" "fmt"
"net/url" "net/url"
"path" "path"
"strings"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
) )
@ -128,7 +129,11 @@ func (c *WSClient) handleWS(ctx context.Context, rawurl string, q chan Event) er
q <- &NotificationEvent{Notification: &notification} q <- &NotificationEvent{Notification: &notification}
} }
case "delete": case "delete":
q <- &DeleteEvent{ID: ID(fmt.Sprint(int64(s.Payload.(float64))))} if f, ok := s.Payload.(float64); ok {
q <- &DeleteEvent{ID: ID(fmt.Sprint(int64(f)))}
} else {
q <- &DeleteEvent{ID: ID(strings.TrimSpace(s.Payload.(string)))}
}
} }
if err != nil { if err != nil {
q <- &ErrorEvent{err} q <- &ErrorEvent{err}