Commit 82cc8e08026a8ec789d060475f0b27182e5c2f96 - golang-github-nlopes-slack

Fixed unmarshalling for channel rename event. Michael Stewart authored 8 years ago Norberto Lopes committed 8 years ago

3 changed file(s) with 19 addition(s) and 7 deletion(s). Raw diff Collapse all Expand all

-5

websocket_channels.go less more

35	35
36	36	// ChannelRenameEvent represents the Channel rename event
37	37	type ChannelRenameEvent struct {
38		Type string `json:"type"`
39		Channel ChannelRenameInfo `json:"channel"`
	38	Type string `json:"type"`
	39	Channel ChannelRenameInfo `json:"channel"`
	40	Timestamp string `json:"event_ts"`
40	41	}
41	42
42	43	// ChannelRenameInfo represents the information associated with a Channel rename event
43	44	type ChannelRenameInfo struct {
44		ID string `json:"id"`
45		Name string `json:"name"`
46		Created JSONTimeString `json:"created"`
	45	ID string `json:"id"`
	46	Name string `json:"name"`
	47	Created *JSONTimeString `json:"created"`
47	48	}
48	49
49	50	// ChannelHistoryChangedEvent represents the Channel history changed event

+12

-1

websocket_groups.go less more

31	31	type GroupJoinedEvent ChannelJoinedEvent
32	32
33	33	// GroupRenameEvent represents the Group rename event
34		type GroupRenameEvent ChannelRenameEvent
	34	type GroupRenameEvent struct {
	35	Type string `json:"type"`
	36	Group GroupRenameInfo `json:"channel"`
	37	Timestamp string `json:"ts"`
	38	}
	39
	40	// GroupRenameInfo represents the group info related to the renamed group
	41	type GroupRenameInfo struct {
	42	ID string `json:"id"`
	43	Name string `json:"name"`
	44	Created string `json:"created"`
	45	}
35	46
36	47	// GroupHistoryChangedEvent represents the Group history changed event
37	48	type GroupHistoryChangedEvent ChannelHistoryChangedEvent

-1

websocket_managed_conn.go less more

388	388	recvEvent := reflect.New(t).Interface()
389	389	err := json.Unmarshal(event, recvEvent)
390	390	if err != nil {
391		rtm.Debugf("RTM Error, received unmapped event %q: %s\n", typeStr, string(event))
	391	rtm.Debugf("RTM Error, could not unmarshall event %q: %s\n", typeStr, string(event))
392	392	err := fmt.Errorf("RTM Error: Could not unmarshall event %q: %s\n", typeStr, string(event))
393	393	rtm.IncomingEvents <- SlackEvent{"unmarshalling_error", &UnmarshallingErrorEvent{err}}
394	394	return