keybase
/
gokeybase
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Remove more custom types

main
Sam 5 years ago
parent
6c11327289
commit
4e55ebaf05
2 changed files with 50 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 103
      chat.go
  2. 17
      types.go

103
chat.go
Unescape View File

@ -222,8 +222,13 @@ func chatAPIOut(k *Keybase, c ChatAPI) (ChatAPI, error) {
} }
// SendMessage sends a chat message // SendMessage sends a chat message
func (k *Keybase) SendMessage(method string, options SendMessageOptions) (SendResponse, error) { func (k *Keybase) SendMessage(method string, options SendMessageOptions) (chat1.SendRes, error) {
var r SendResponse type res struct {
Result chat1.SendRes `json:"result"`
Error *Error `json:"error,omitempty"`
}
var r res
arg := newSendMessageArg(options) arg := newSendMessageArg(options)
arg.Method = method arg.Method = method
@ -232,20 +237,24 @@ func (k *Keybase) SendMessage(method string, options SendMessageOptions) (SendRe
cmdOut, err := k.Exec("chat", "api", "-m", string(jsonBytes)) cmdOut, err := k.Exec("chat", "api", "-m", string(jsonBytes))
if err != nil { if err != nil {
return r, err return r.Result, err
} }
err = json.Unmarshal(cmdOut, &r) err = json.Unmarshal(cmdOut, &r)
if err != nil { if err != nil {
return r, err return r.Result, err
} }
return r, nil if r.Error != nil {
return r.Result, fmt.Errorf("%v", r.Error.Message)
}
return r.Result, nil
} }
// SendMessageByChannel sends a chat message to a channel // SendMessageByChannel sends a chat message to a channel
func (k *Keybase) SendMessageByChannel(channel chat1.ChatChannel, message string, a ...interface{}) (SendResponse, error) { func (k *Keybase) SendMessageByChannel(channel chat1.ChatChannel, message string, a ...interface{}) (chat1.SendRes, error) {
var r SendResponse var r chat1.SendRes
opts := SendMessageOptions{ opts := SendMessageOptions{
Channel: channel, Channel: channel,
@ -263,8 +272,8 @@ func (k *Keybase) SendMessageByChannel(channel chat1.ChatChannel, message string
} }
// SendMessageByConvID sends a chat message to a conversation id // SendMessageByConvID sends a chat message to a conversation id
func (k *Keybase) SendMessageByConvID(convID chat1.ConvIDStr, message string, a ...interface{}) (SendResponse, error) { func (k *Keybase) SendMessageByConvID(convID chat1.ConvIDStr, message string, a ...interface{}) (chat1.SendRes, error) {
var r SendResponse var r chat1.SendRes
opts := SendMessageOptions{ opts := SendMessageOptions{
ConversationID: convID, ConversationID: convID,
@ -282,8 +291,8 @@ func (k *Keybase) SendMessageByConvID(convID chat1.ConvIDStr, message string, a
} }
// SendEphemeralByChannel sends an exploding chat message to a channel // SendEphemeralByChannel sends an exploding chat message to a channel
func (k *Keybase) SendEphemeralByChannel(channel chat1.ChatChannel, duration time.Duration, message string, a ...interface{}) (SendResponse, error) { func (k *Keybase) SendEphemeralByChannel(channel chat1.ChatChannel, duration time.Duration, message string, a ...interface{}) (chat1.SendRes, error) {
var r SendResponse var r chat1.SendRes
opts := SendMessageOptions{ opts := SendMessageOptions{
Channel: channel, Channel: channel,
@ -302,8 +311,8 @@ func (k *Keybase) SendEphemeralByChannel(channel chat1.ChatChannel, duration tim
} }
// SendEphemeralByConvID sends an exploding chat message to a conversation id // SendEphemeralByConvID sends an exploding chat message to a conversation id
func (k *Keybase) SendEphemeralByConvID(convID chat1.ConvIDStr, duration time.Duration, message string, a ...interface{}) (SendResponse, error) { func (k *Keybase) SendEphemeralByConvID(convID chat1.ConvIDStr, duration time.Duration, message string, a ...interface{}) (chat1.SendRes, error) {
var r SendResponse var r chat1.SendRes
opts := SendMessageOptions{ opts := SendMessageOptions{
ConversationID: convID, ConversationID: convID,
@ -322,8 +331,8 @@ func (k *Keybase) SendEphemeralByConvID(convID chat1.ConvIDStr, duration time.Du
} }
// ReplyByChannel sends a reply message to a channel // ReplyByChannel sends a reply message to a channel
func (k *Keybase) ReplyByChannel(channel chat1.ChatChannel, replyTo chat1.MessageID, message string, a ...interface{}) (SendResponse, error) { func (k *Keybase) ReplyByChannel(channel chat1.ChatChannel, replyTo chat1.MessageID, message string, a ...interface{}) (chat1.SendRes, error) {
var r SendResponse var r chat1.SendRes
opts := SendMessageOptions{ opts := SendMessageOptions{
Channel: channel, Channel: channel,
@ -342,8 +351,8 @@ func (k *Keybase) ReplyByChannel(channel chat1.ChatChannel, replyTo chat1.Messag
} }
// ReplyByConvID sends a reply message to a conversation id // ReplyByConvID sends a reply message to a conversation id
func (k *Keybase) ReplyByConvID(convID chat1.ConvIDStr, replyTo chat1.MessageID, message string, a ...interface{}) (SendResponse, error) { func (k *Keybase) ReplyByConvID(convID chat1.ConvIDStr, replyTo chat1.MessageID, message string, a ...interface{}) (chat1.SendRes, error) {
var r SendResponse var r chat1.SendRes
opts := SendMessageOptions{ opts := SendMessageOptions{
ConversationID: convID, ConversationID: convID,
@ -362,8 +371,8 @@ func (k *Keybase) ReplyByConvID(convID chat1.ConvIDStr, replyTo chat1.MessageID,
} }
// EditByChannel sends an edit message to a channel // EditByChannel sends an edit message to a channel
func (k *Keybase) EditByChannel(channel chat1.ChatChannel, msgID chat1.MessageID, message string, a ...interface{}) (SendResponse, error) { func (k *Keybase) EditByChannel(channel chat1.ChatChannel, msgID chat1.MessageID, message string, a ...interface{}) (chat1.SendRes, error) {
var r SendResponse var r chat1.SendRes
opts := SendMessageOptions{ opts := SendMessageOptions{
Channel: channel, Channel: channel,
@ -382,8 +391,8 @@ func (k *Keybase) EditByChannel(channel chat1.ChatChannel, msgID chat1.MessageID
} }
// EditByConvID sends an edit message to a conversation id // EditByConvID sends an edit message to a conversation id
func (k *Keybase) EditByConvID(convID chat1.ConvIDStr, msgID chat1.MessageID, message string, a ...interface{}) (SendResponse, error) { func (k *Keybase) EditByConvID(convID chat1.ConvIDStr, msgID chat1.MessageID, message string, a ...interface{}) (chat1.SendRes, error) {
var r SendResponse var r chat1.SendRes
opts := SendMessageOptions{ opts := SendMessageOptions{
ConversationID: convID, ConversationID: convID,
@ -402,8 +411,8 @@ func (k *Keybase) EditByConvID(convID chat1.ConvIDStr, msgID chat1.MessageID, me
} }
// ReactByChannel reacts to a message in a channel // ReactByChannel reacts to a message in a channel
func (k *Keybase) ReactByChannel(channel chat1.ChatChannel, msgID chat1.MessageID, message string, a ...interface{}) (SendResponse, error) { func (k *Keybase) ReactByChannel(channel chat1.ChatChannel, msgID chat1.MessageID, message string, a ...interface{}) (chat1.SendRes, error) {
var r SendResponse var r chat1.SendRes
opts := SendMessageOptions{ opts := SendMessageOptions{
Channel: channel, Channel: channel,
@ -422,8 +431,8 @@ func (k *Keybase) ReactByChannel(channel chat1.ChatChannel, msgID chat1.MessageI
} }
// ReactByConvID reacts to a message in a conversation id // ReactByConvID reacts to a message in a conversation id
func (k *Keybase) ReactByConvID(convID chat1.ConvIDStr, msgID chat1.MessageID, message string, a ...interface{}) (SendResponse, error) { func (k *Keybase) ReactByConvID(convID chat1.ConvIDStr, msgID chat1.MessageID, message string, a ...interface{}) (chat1.SendRes, error) {
var r SendResponse var r chat1.SendRes
opts := SendMessageOptions{ opts := SendMessageOptions{
ConversationID: convID, ConversationID: convID,
@ -442,8 +451,8 @@ func (k *Keybase) ReactByConvID(convID chat1.ConvIDStr, msgID chat1.MessageID, m
} }
// DeleteByChannel reacts to a message in a channel // DeleteByChannel reacts to a message in a channel
func (k *Keybase) DeleteByChannel(channel chat1.ChatChannel, msgID chat1.MessageID) (SendResponse, error) { func (k *Keybase) DeleteByChannel(channel chat1.ChatChannel, msgID chat1.MessageID) (chat1.SendRes, error) {
var r SendResponse var r chat1.SendRes
opts := SendMessageOptions{ opts := SendMessageOptions{
Channel: channel, Channel: channel,
@ -459,8 +468,8 @@ func (k *Keybase) DeleteByChannel(channel chat1.ChatChannel, msgID chat1.Message
} }
// DeleteByConvID reacts to a message in a conversation id // DeleteByConvID reacts to a message in a conversation id
func (k *Keybase) DeleteByConvID(convID chat1.ConvIDStr, msgID chat1.MessageID) (SendResponse, error) { func (k *Keybase) DeleteByConvID(convID chat1.ConvIDStr, msgID chat1.MessageID) (chat1.SendRes, error) {
var r SendResponse var r chat1.SendRes
opts := SendMessageOptions{ opts := SendMessageOptions{
ConversationID: convID, ConversationID: convID,
@ -475,9 +484,14 @@ func (k *Keybase) DeleteByConvID(convID chat1.ConvIDStr, msgID chat1.MessageID)
return r, nil return r, nil
} }
// GetConversations returns a list of all conversations. Optionally, you can filter by unread // GetConversations returns a list of all conversations.
func (k *Keybase) GetConversations(unreadOnly bool) ([]chat1.ConvSummary, error) { func (k *Keybase) GetConversations(unreadOnly bool) ([]chat1.ConvSummary, error) {
var r Inbox type res struct {
Result []chat1.ConvSummary `json:"result"`
Error *Error `json:"error,omitempty"`
}
var r res
opts := SendMessageOptions{ opts := SendMessageOptions{
UnreadOnly: unreadOnly, UnreadOnly: unreadOnly,
@ -490,36 +504,19 @@ func (k *Keybase) GetConversations(unreadOnly bool) ([]chat1.ConvSummary, error)
cmdOut, err := k.Exec("chat", "api", "-m", string(jsonBytes)) cmdOut, err := k.Exec("chat", "api", "-m", string(jsonBytes))
if err != nil { if err != nil {
return []chat1.ConvSummary{}, err return r.Result, err
} }
err = json.Unmarshal(cmdOut, &r) err = json.Unmarshal(cmdOut, &r)
if err != nil { if err != nil {
return []chat1.ConvSummary{}, err return r.Result, err
} }
return r.Result.Convs, nil if r.Error != nil {
} return r.Result, fmt.Errorf("%v", r.Error.Message)
// ChatList returns a list of all conversations.
// You can pass a Channel to use as a filter here, but you'll probably want to
// leave the TopicName empty.
func (k *Keybase) ChatList(opts ...chat1.ChatChannel) (ChatAPI, error) {
m := ChatAPI{
Params: &params{},
} }
if len(opts) > 0 { return r.Result, nil
m.Params.Options.Name = opts[0].Name
m.Params.Options.Public = opts[0].Public
m.Params.Options.MembersType = opts[0].MembersType
m.Params.Options.TopicType = opts[0].TopicType
m.Params.Options.TopicName = opts[0].TopicName
}
m.Method = "list"
r, err := chatAPIOut(k, m)
return r, err
} }
// ReadMessage fetches the chat message with the specified message id from a conversation. // ReadMessage fetches the chat message with the specified message id from a conversation.

17
types.go
Unescape View File

@ -97,23 +97,6 @@ func newSendMessageArg(options SendMessageOptions) sendMessageArg {
} }
} }
// Result holds the result porstion of a `list` method sent to the API
type Result struct {
Convs []chat1.ConvSummary `json:"conversations"`
}
// Inbox holds the results of a `list`method sent to the API
type Inbox struct {
Result Result `json:"result"`
Error *Error `json:"error,omitempty"`
}
// SendResponse holds the data returned by the send method in the API
type SendResponse struct {
Result chat1.SendRes `json:"result"`
Error *Error `json:"error,omitempty"`
}
type KVOptions struct { type KVOptions struct {
Team *string `json:"team"` Team *string `json:"team"`
Namespace *string `json:"namespace,omitempty"` Namespace *string `json:"namespace,omitempty"`

Write Preview
Loading…
Cancel
Save