Fix import path in go.mod

chat.go

@@ -5,11 +5,9 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"os/exec"
 	"time"
 
 	"samhofi.us/x/keybase/v2/types/chat1"
-	"samhofi.us/x/keybase/v2/types/keybase1"
 	"samhofi.us/x/keybase/v2/types/stellar1"
 )
 
@@ -38,7 +36,15 @@ func getNewMessages(k *Keybase, subs *subscriptionChannels, execOptions []string
 		execString = append(execString, execOptions...)
 	}
 	for {
-		execCmd := exec.Command(k.Path, execString...)
+		cmd := make([]string, 0)
+
+		if k.HomePath != "" {
+			cmd = append(cmd, "--home", k.HomePath)
+		}
+
+		cmd = append(cmd, execString...)
+
+		execCmd := execCommand(k.ExePath, cmd...)
 		stdOut, _ := execCmd.StdoutPipe()
 		execCmd.Start()
 		scanner := bufio.NewScanner(stdOut)
@@ -701,9 +707,9 @@ func (k *Keybase) ClearCommands() error {
 }
 
 // ListMembers returns member information for a channel or conversation
-func (k *Keybase) ListMembers(options ListMembersOptions) (keybase1.TeamDetails, error) {
+func (k *Keybase) ListMembers(options ListMembersOptions) (chat1.ChatMembersDetails, error) {
 	type res struct {
-		Result keybase1.TeamDetails `json:"result"`
+		Result chat1.ChatMembersDetails `json:"result"`
 		Error  *Error                   `json:"error,omitempty"`
 	}
 
@@ -731,7 +737,7 @@ func (k *Keybase) ListMembers(options ListMembersOptions) (keybase1.TeamDetails,
 }
 
 // ListMembersOfChannel returns member information for a channel
-func (k *Keybase) ListMembersOfChannel(channel chat1.ChatChannel) (keybase1.TeamDetails, error) {
+func (k *Keybase) ListMembersOfChannel(channel chat1.ChatChannel) (chat1.ChatMembersDetails, error) {
 	opts := ListMembersOptions{
 		Channel: channel,
 	}
@@ -739,9 +745,43 @@ func (k *Keybase) ListMembersOfChannel(channel chat1.ChatChannel) (keybase1.Team
 }
 
 // ListMembersOfConversation returns member information for a conversation
-func (k *Keybase) ListMembersOfConversation(convID chat1.ConvIDStr) (keybase1.TeamDetails, error) {
+func (k *Keybase) ListMembersOfConversation(convID chat1.ConvIDStr) (chat1.ChatMembersDetails, error) {
 	opts := ListMembersOptions{
 		ConversationID: convID,
 	}
 	return k.ListMembers(opts)
 }
+
+// ListConvsOnName returns a list of all conversations for a chat1.ChatChannel
+func (k *Keybase) ListConvsOnName(channel chat1.ChatChannel) (*[]chat1.ConvSummary, error) {
+	type result struct {
+		Conversations []chat1.ConvSummary `json:"conversations"`
+	}
+
+	type res struct {
+		Result result `json:"result"`
+		Error  *Error `json:"error,omitempty"`
+	}
+
+	var r res
+
+	arg := newListConvsOnNameArg(channel)
+
+	jsonBytes, _ := json.Marshal(arg)
+
+	cmdOut, err := k.Exec("chat", "api", "-m", string(jsonBytes))
+	if err != nil {
+		return nil, err
+	}
+
+	err = json.Unmarshal(cmdOut, &r)
+	if err != nil {
+		return nil, err
+	}
+
+	if r.Error != nil {
+		return nil, fmt.Errorf("%v", r.Error.Message)
+	}
+
+	return &r.Result.Conversations, nil
+}

chat_test.go

@@ -0,0 +1,135 @@
+package keybase
+
+import (
+	"os/exec"
+	"testing"
+
+	"samhofi.us/x/keybase/v2/types/chat1"
+)
+
+func TestListConvsOnName(t *testing.T) {
+	execCommand = createFakeExecCommand("listconvsonname")
+	defer func() { execCommand = exec.Command }()
+
+	channel := chat1.ChatChannel{
+		Name:        "mkbot",
+		MembersType: TEAM,
+	}
+	k := New()
+	res, err := k.ListConvsOnName(channel)
+	if err != nil {
+		t.Errorf("Expected nil error, got %#v", err)
+	}
+
+	channelcount := 10
+	if len(*res) != channelcount {
+		t.Errorf("Expected %d channels, got %d channels", channelcount, len(*res))
+	}
+}
+
+func TestSendMessageByChannel(t *testing.T) {
+	execCommand = createFakeExecCommand("send")
+	defer func() { execCommand = exec.Command }()
+
+	channel := chat1.ChatChannel{
+		Name:        "user1,user2",
+		MembersType: USER,
+	}
+	k := New()
+	res, err := k.SendMessageByChannel(channel, "Hello!")
+	if err != nil {
+		t.Errorf("Expected nil error, got %#v", err)
+	}
+
+	if expected := "message sent"; res.Message != expected {
+		t.Errorf(`res.Message: expected "%s", got "%v"`, expected, res.Message)
+	}
+
+	if expected := uint(894); uint(*res.MessageID) != expected {
+		t.Errorf(`res.MessageID: expected %d, got %d`, expected, uint(*res.MessageID))
+	}
+}
+
+func TestSendMessageByConvID(t *testing.T) {
+	execCommand = createFakeExecCommand("send")
+	defer func() { execCommand = exec.Command }()
+
+	k := New()
+	res, err := k.SendMessageByConvID(chat1.ConvIDStr("000049d2395435dff0c865c18832d9645eb69fd74a2814ef55310b294092ba6d"), "Hello!")
+	if err != nil {
+		t.Errorf("Expected nil error, got %#v", err)
+	}
+
+	if expected := "message sent"; res.Message != expected {
+		t.Errorf(`res.Message: expected "%s", got "%v"`, expected, res.Message)
+	}
+
+	if expected := uint(894); uint(*res.MessageID) != expected {
+		t.Errorf(`res.MessageID: expected %d, got %d`, expected, uint(*res.MessageID))
+	}
+}
+
+func TestCreateFilterString(t *testing.T) {
+	tables := []struct {
+		channel  chat1.ChatChannel
+		expected string
+	}{
+		{
+			chat1.ChatChannel{},
+			``,
+		},
+		{
+			chat1.ChatChannel{Name: "faketeam", MembersType: TEAM},
+			`{"name":"faketeam","members_type":"team"}`,
+		},
+		{
+			chat1.ChatChannel{Name: "user1,user2", MembersType: USER},
+			`{"name":"user1,user2","members_type":"impteamnative"}`,
+		},
+	}
+
+	for _, table := range tables {
+		if result := createFilterString(table.channel); result != table.expected {
+			t.Errorf(`Expected "%s", got "%s"`, table.expected, result)
+		}
+	}
+}
+
+func TestCreateFiltersString(t *testing.T) {
+	tables := []struct {
+		channel  []chat1.ChatChannel
+		expected string
+	}{
+		{
+			[]chat1.ChatChannel{},
+			``,
+		},
+		{
+			[]chat1.ChatChannel{
+				chat1.ChatChannel{Name: "faketeam1", MembersType: TEAM},
+				chat1.ChatChannel{Name: "faketeam2", MembersType: TEAM},
+			},
+			`[{"name":"faketeam1","members_type":"team"},{"name":"faketeam2","members_type":"team"}]`,
+		},
+		{
+			[]chat1.ChatChannel{
+				chat1.ChatChannel{Name: "user1,user2", MembersType: USER},
+				chat1.ChatChannel{Name: "user3,user4", MembersType: USER},
+			},
+			`[{"name":"user1,user2","members_type":"impteamnative"},{"name":"user3,user4","members_type":"impteamnative"}]`,
+		},
+		{
+			[]chat1.ChatChannel{
+				chat1.ChatChannel{Name: "user1,user2", MembersType: USER},
+				chat1.ChatChannel{Name: "faketeam1", MembersType: TEAM},
+			},
+			`[{"name":"user1,user2","members_type":"impteamnative"},{"name":"faketeam1","members_type":"team"}]`,
+		},
+	}
+
+	for _, table := range tables {
+		if result := createFiltersString(table.channel); result != table.expected {
+			t.Errorf(`Expected "%s", got "%s"`, table.expected, result)
+		}
+	}
+}

keybase.go

@@ -9,6 +9,9 @@ import (
 	"samhofi.us/x/keybase/v2/types/chat1"
 )
 
+// Used for testing
+var execCommand = exec.Command
+
 // Possible MemberTypes
 const (
 	TEAM string = "team"
@@ -21,13 +24,33 @@ const (
 	CHAT string = "chat"
 )
 
+// New returns a new Keybase
+func New(opts ...KeybaseOpt) *Keybase {
+	k := &Keybase{ExePath: "keybase"}
+
+	for _, opt := range opts {
+		opt.apply(k)
+	}
+
+	s := k.status()
+	k.Version = k.version()
+	k.LoggedIn = s.LoggedIn
+	if k.LoggedIn {
+		k.Username = s.Username
+		k.Device = s.Device.Name
+	}
+
+	return k
+}
+
 // NewKeybase returns a new Keybase. Optionally, you can pass a string containing the path to the Keybase executable as the first argument.
+// This is deprecated and will be removed in a future update. Use New() instead.
 func NewKeybase(path ...string) *Keybase {
 	k := &Keybase{}
 	if len(path) < 1 {
-		k.Path = "keybase"
+		k.ExePath = "keybase"
 	} else {
-		k.Path = path[0]
+		k.ExePath = path[0]
 	}
 
 	s := k.status()
@@ -42,7 +65,15 @@ func NewKeybase(path ...string) *Keybase {
 
 // Exec executes the given Keybase command
 func (k *Keybase) Exec(command ...string) ([]byte, error) {
-	out, err := exec.Command(k.Path, command...).Output()
+	cmd := make([]string, 0)
+
+	if k.HomePath != "" {
+		cmd = append(cmd, "--home", k.HomePath)
+	}
+
+	cmd = append(cmd, command...)
+
+	out, err := execCommand(k.ExePath, cmd...).Output()
 	if err != nil {
 		return []byte{}, err
 	}

keybase_test.go

@@ -0,0 +1,68 @@
+package keybase
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"testing"
+)
+
+func createFakeExecCommand(caller string) func(command string, args ...string) *exec.Cmd {
+	return func(command string, args ...string) *exec.Cmd {
+		cs := []string{"-test.run=ExecHelper", "--"}
+		cs = append(cs, args...)
+		cmd := exec.Command(os.Args[0], cs...)
+		cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1", "GO_WANT_HELPER_CALLER=" + caller}
+		return cmd
+	}
+}
+
+func TestNew(t *testing.T) {
+	execCommand = createFakeExecCommand("new")
+	defer func() { execCommand = exec.Command }()
+
+	k := New()
+
+	if expected := "keybase"; k.ExePath != expected {
+		t.Errorf(`k.ExePath: expected "%s", got "%s"`, expected, k.ExePath)
+	}
+	if expected := ""; k.HomePath != expected {
+		t.Errorf(`k.HomePath: expected "%s", got "%s"`, expected, k.HomePath)
+	}
+
+	k = New(
+		SetExePath("/path/to/exepath"),
+		SetHomePath("/path/to/homepath"),
+	)
+
+	if expected := "/path/to/exepath"; k.ExePath != expected {
+		t.Errorf(`k.ExePath: expected "%s", got "%s"`, expected, k.ExePath)
+	}
+	if expected := "/path/to/homepath"; k.HomePath != expected {
+		t.Errorf(`k.HomePath: expected "%s", got "%s"`, expected, k.HomePath)
+	}
+}
+
+func TestExecHelper(t *testing.T) {
+	if os.Getenv("GO_WANT_HELPER_PROCESS") != "1" {
+		return
+	}
+
+	var (
+		listconvsonname = `{"result":{"conversations":[{"id":"0000b9d9be8586029d4876af2192b94d6705603cf6859fc27c746de94befd45c","channel":{"name":"mkbot","members_type":"team","topic_type":"chat"},"is_default_conv":false,"unread":true,"active_at":1589468132,"active_at_ms":1589468132734,"member_status":"active","creator_info":{"ctime":1551848940888,"username":"dxb"}},{"id":"0000d2c4d915aa04c093a25b9496cd885ff510f4eeeacac5a7249f65d82ed0ad","channel":{"name":"mkbot","members_type":"team","topic_type":"chat"},"is_default_conv":false,"unread":false,"active_at":1589633805,"active_at_ms":1589633805970,"member_status":"active","creator_info":{"ctime":1551848919282,"username":"dxb"}},{"id":"0000e967261971be5aae47d1cfd7d77e695d4a2f90e2ee35236ef3472b2884d4","channel":{"name":"mkbot","members_type":"team","topic_type":"chat","topic_name":"gameroom"},"is_default_conv":false,"unread":true,"active_at":1589468113,"active_at_ms":1589468113173,"member_status":"active","creator_info":{"ctime":1566244683161,"username":"dxb"}},{"id":"0000d5ae3da566307f6c9906881e5bd08dc9a0bf8c341b5769240026e367c478","channel":{"name":"mkbot","members_type":"team","topic_type":"chat","topic_name":"general"},"is_default_conv":true,"unread":false,"active_at":1589348381,"active_at_ms":1589348381358,"member_status":"active","creator_info":{"ctime":1551840458201,"username":"dxb"}},{"id":"0000d7cf1e6f51d75f9a354c2cb7c3bd30415f184bbb9eba0c57aa50827b7663","channel":{"name":"mkbot","members_type":"team","topic_type":"chat","topic_name":"test1"},"is_default_conv":false,"unread":true,"active_at":1589468203,"active_at_ms":1589468203686,"member_status":"active","creator_info":{"ctime":1551849049656,"username":"dxb"}},{"id":"0000d0cf70804671490e7f8f21c207a1ac6a8bc2ee05db804fb4531ab6c06f05","channel":{"name":"mkbot","members_type":"team","topic_type":"chat","topic_name":"test2"},"is_default_conv":false,"unread":true,"active_at":1589468118,"active_at_ms":1589468118254,"member_status":"active","creator_info":{"ctime":1551849050007,"username":"dxb"}},{"id":"000044e620fef1e84b623350faff06ebef7a0cd7e403ba81a1b35d311976b9f6","channel":{"name":"mkbot","members_type":"team","topic_type":"chat","topic_name":"test3"},"is_default_conv":false,"unread":true,"active_at":1589468117,"active_at_ms":1589468117094,"member_status":"active","creator_info":{"ctime":1551849050351,"username":"dxb"}},{"id":"0000a8dd5969f6bb414562278a5abf8f3bd80b39d7cdcf0d3df5045f05fbac77","channel":{"name":"mkbot","members_type":"team","topic_type":"chat","topic_name":"test4"},"is_default_conv":false,"unread":true,"active_at":1589468197,"active_at_ms":1589468197735,"member_status":"active","creator_info":{"ctime":1551849050729,"username":"dxb"}},{"id":"00004380e20bf4d56cf5e80a7435d594e07ebe043da93468c93c9bf0080f9ef5","channel":{"name":"mkbot","members_type":"team","topic_type":"chat","topic_name":"test5"},"is_default_conv":false,"unread":true,"active_at":1589468203,"active_at_ms":1589468203980,"member_status":"active","creator_info":{"ctime":1551849051084,"username":"dxb"}},{"id":"00003bd0aa429c33eee546f20efb76c9e0a9854b0ca18278300bcf6fc4c4fb93","channel":{"name":"mkbot","members_type":"team","topic_type":"chat","topic_name":"trivia"},"is_default_conv":false,"unread":false,"active_at":1589468113,"active_at_ms":1589468113074,"member_status":"active","creator_info":{"ctime":1580428008401,"username":"dxb"}}],"offline":false}}`
+		send            = `{"result":{"message":"message sent","id":894,"ratelimits":[{"tank":"chat","capacity":9000,"reset":155,"gas":8991}]}}`
+	)
+
+	var jsonOut string
+	switch os.Getenv("GO_WANT_HELPER_CALLER") {
+	case "listconvsonname":
+		jsonOut = listconvsonname
+	case "send":
+		jsonOut = send
+	default:
+		jsonOut = ""
+	}
+
+	fmt.Fprintf(os.Stdout, jsonOut)
+	os.Exit(0)
+}

types.go

@@ -20,6 +20,37 @@ type RunOptions struct {
 	FilterChannels []chat1.ChatChannel // Only subscribe to messages from specified channels
 }
 
+// KeybaseOpt configures a Keybase
+type KeybaseOpt interface {
+	apply(kb *Keybase)
+}
+
+// SetExePath sets the path to the Keybase executable
+func SetExePath(path string) KeybaseOpt {
+	return setExePath{path}
+}
+
+type setExePath struct {
+	path string
+}
+
+func (o setExePath) apply(kb *Keybase) {
+	kb.ExePath = o.path
+}
+
+// SetHomePath sets the path to the Keybase home directory
+func SetHomePath(path string) KeybaseOpt {
+	return setHomePath{path}
+}
+
+type setHomePath struct {
+	path string
+}
+
+func (o setHomePath) apply(kb *Keybase) {
+	kb.HomePath = o.path
+}
+
 type subscriptionType struct {
 	Type string `json:"type"`
 }
@@ -83,6 +114,7 @@ type SendMessageOptions struct {
 	ReplyTo           *chat1.MessageID   `json:"reply_to,omitempty"`
 	ExplodingLifetime *ExplodingLifetime `json:"exploding_lifetime,omitempty"`
 	UnreadOnly        bool               `json:"unread_only,omitempty"`
+	NonBlock          bool               `json:"nonblock,omitempty"`
 }
 
 type sendMessageParams struct {
@@ -207,6 +239,24 @@ func newListMembersArg(options ListMembersOptions) listMembersArg {
 	}
 }
 
+type listConvsOnNameParams struct {
+	Options chat1.ChatChannel
+}
+
+type listConvsOnNameArg struct {
+	Method string
+	Params listConvsOnNameParams
+}
+
+func newListConvsOnNameArg(channel chat1.ChatChannel) listConvsOnNameArg {
+	return listConvsOnNameArg{
+		Method: "listconvsonname",
+		Params: listConvsOnNameParams{
+			Options: channel,
+		},
+	}
+}
+
 // KVOptions holds a set of options to be passed to the KV methods
 type KVOptions struct {
 	Team       *string `json:"team"`
@@ -954,7 +1004,8 @@ type userBlocks struct {
 
 // Keybase holds basic information about the local Keybase executable
 type Keybase struct {
-	Path     string
+	HomePath string
+	ExePath  string
 	Username string
 	LoggedIn bool
 	Version  string

types/chat1/api.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/api.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/api.avdl
 
 package chat1
 
@@ -942,6 +942,7 @@ type AdvertiseCommandAPIParam struct {
 	Typ      string                `codec:"typ" json:"type"`
 	Commands []UserBotCommandInput `codec:"commands" json:"commands"`
 	TeamName string                `codec:"teamName,omitempty" json:"team_name,omitempty"`
+	ConvID   ConvIDStr             `codec:"convID,omitempty" json:"conv_id,omitempty"`
 }
 
 func (o AdvertiseCommandAPIParam) DeepCopy() AdvertiseCommandAPIParam {
@@ -959,6 +960,7 @@ func (o AdvertiseCommandAPIParam) DeepCopy() AdvertiseCommandAPIParam {
 			return ret
 		})(o.Commands),
 		TeamName: o.TeamName,
+		ConvID:   o.ConvID.DeepCopy(),
 	}
 }
 

types/chat1/blocking.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/blocking.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/blocking.avdl
 
 package chat1

types/chat1/chat_ui.go

@@ -1,14 +1,15 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/chat_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/chat_ui.avdl
 
 package chat1
 
 import (
+	"errors"
+	"fmt"
+
 	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
 	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 	stellar1 "samhofi.us/x/keybase/v2/types/stellar1"
-	"errors"
-	"fmt"
 )
 
 type UIPagination struct {

types/chat1/commands.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/commands.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/commands.avdl
 
 package chat1
 

types/chat1/common.go

@@ -1,13 +1,15 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/common.avdl
 
 package chat1
 
 import (
-	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
-	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 	"errors"
 	"fmt"
+
+	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
+	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
+	stellar1 "samhofi.us/x/keybase/v2/types/stellar1"
 )
 
 type ThreadID []byte
@@ -1368,6 +1370,7 @@ type MessageClientHeader struct {
 	EphemeralMetadata *MsgEphemeralMetadata    `codec:"em,omitempty" json:"em,omitempty"`
 	PairwiseMacs      map[keybase1.KID][]byte  `codec:"pm" json:"pm"`
 	BotUID            *gregor1.UID             `codec:"b,omitempty" json:"b,omitempty"`
+	TxID              *stellar1.TransactionID  `codec:"t,omitempty" json:"t,omitempty"`
 }
 
 func (o MessageClientHeader) DeepCopy() MessageClientHeader {
@@ -1467,6 +1470,13 @@ func (o MessageClientHeader) DeepCopy() MessageClientHeader {
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.BotUID),
+		TxID: (func(x *stellar1.TransactionID) *stellar1.TransactionID {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x).DeepCopy()
+			return &tmp
+		})(o.TxID),
 	}
 }
 
@@ -2481,6 +2491,7 @@ const (
 	BotCommandsAdvertisementTyp_PUBLIC        BotCommandsAdvertisementTyp = 0
 	BotCommandsAdvertisementTyp_TLFID_MEMBERS BotCommandsAdvertisementTyp = 1
 	BotCommandsAdvertisementTyp_TLFID_CONVS   BotCommandsAdvertisementTyp = 2
+	BotCommandsAdvertisementTyp_CONV          BotCommandsAdvertisementTyp = 3
 )
 
 func (o BotCommandsAdvertisementTyp) DeepCopy() BotCommandsAdvertisementTyp { return o }
@@ -2489,12 +2500,14 @@ var BotCommandsAdvertisementTypMap = map[string]BotCommandsAdvertisementTyp{
 	"PUBLIC":        0,
 	"TLFID_MEMBERS": 1,
 	"TLFID_CONVS":   2,
+	"CONV":          3,
 }
 
 var BotCommandsAdvertisementTypRevMap = map[BotCommandsAdvertisementTyp]string{
 	0: "PUBLIC",
 	1: "TLFID_MEMBERS",
 	2: "TLFID_CONVS",
+	3: "CONV",
 }
 
 func (e BotCommandsAdvertisementTyp) String() string {
@@ -2546,3 +2559,97 @@ func (e LastActiveStatus) String() string {
 	}
 	return fmt.Sprintf("%v", int(e))
 }
+
+type ChatMemberDetails struct {
+	Uid      keybase1.UID      `codec:"uid" json:"uid"`
+	Username string            `codec:"username" json:"username"`
+	FullName keybase1.FullName `codec:"fullName" json:"fullName"`
+}
+
+func (o ChatMemberDetails) DeepCopy() ChatMemberDetails {
+	return ChatMemberDetails{
+		Uid:      o.Uid.DeepCopy(),
+		Username: o.Username,
+		FullName: o.FullName.DeepCopy(),
+	}
+}
+
+type ChatMembersDetails struct {
+	Owners         []ChatMemberDetails `codec:"owners" json:"owners"`
+	Admins         []ChatMemberDetails `codec:"admins" json:"admins"`
+	Writers        []ChatMemberDetails `codec:"writers" json:"writers"`
+	Readers        []ChatMemberDetails `codec:"readers" json:"readers"`
+	Bots           []ChatMemberDetails `codec:"bots" json:"bots"`
+	RestrictedBots []ChatMemberDetails `codec:"restrictedBots" json:"restrictedBots"`
+}
+
+func (o ChatMembersDetails) DeepCopy() ChatMembersDetails {
+	return ChatMembersDetails{
+		Owners: (func(x []ChatMemberDetails) []ChatMemberDetails {
+			if x == nil {
+				return nil
+			}
+			ret := make([]ChatMemberDetails, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.Owners),
+		Admins: (func(x []ChatMemberDetails) []ChatMemberDetails {
+			if x == nil {
+				return nil
+			}
+			ret := make([]ChatMemberDetails, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.Admins),
+		Writers: (func(x []ChatMemberDetails) []ChatMemberDetails {
+			if x == nil {
+				return nil
+			}
+			ret := make([]ChatMemberDetails, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.Writers),
+		Readers: (func(x []ChatMemberDetails) []ChatMemberDetails {
+			if x == nil {
+				return nil
+			}
+			ret := make([]ChatMemberDetails, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.Readers),
+		Bots: (func(x []ChatMemberDetails) []ChatMemberDetails {
+			if x == nil {
+				return nil
+			}
+			ret := make([]ChatMemberDetails, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.Bots),
+		RestrictedBots: (func(x []ChatMemberDetails) []ChatMemberDetails {
+			if x == nil {
+				return nil
+			}
+			ret := make([]ChatMemberDetails, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.RestrictedBots),
+	}
+}

types/chat1/emoji.go

@@ -1,12 +1,13 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/emoji.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/emoji.avdl
 
 package chat1
 
 import (
-	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
 	"errors"
 	"fmt"
+
+	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
 )
 
 type EmojiLoadSourceTyp int
@@ -274,9 +275,12 @@ type Emoji struct {
 	IsBig        bool               `codec:"isBig" json:"isBig"`
 	IsReacji     bool               `codec:"isReacji" json:"isReacji"`
 	IsCrossTeam  bool               `codec:"isCrossTeam" json:"isCrossTeam"`
+	IsAlias      bool               `codec:"isAlias" json:"isAlias"`
 	Source       EmojiLoadSource    `codec:"source" json:"source"`
+	NoAnimSource EmojiLoadSource    `codec:"noAnimSource" json:"noAnimSource"`
 	RemoteSource EmojiRemoteSource  `codec:"remoteSource" json:"remoteSource"`
 	CreationInfo *EmojiCreationInfo `codec:"creationInfo,omitempty" json:"creationInfo,omitempty"`
+	Teamname     *string            `codec:"teamname,omitempty" json:"teamname,omitempty"`
 }
 
 func (o Emoji) DeepCopy() Emoji {
@@ -285,7 +289,9 @@ func (o Emoji) DeepCopy() Emoji {
 		IsBig:        o.IsBig,
 		IsReacji:     o.IsReacji,
 		IsCrossTeam:  o.IsCrossTeam,
+		IsAlias:      o.IsAlias,
 		Source:       o.Source.DeepCopy(),
+		NoAnimSource: o.NoAnimSource.DeepCopy(),
 		RemoteSource: o.RemoteSource.DeepCopy(),
 		CreationInfo: (func(x *EmojiCreationInfo) *EmojiCreationInfo {
 			if x == nil {
@@ -294,6 +300,13 @@ func (o Emoji) DeepCopy() Emoji {
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.CreationInfo),
+		Teamname: (func(x *string) *string {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x)
+			return &tmp
+		})(o.Teamname),
 	}
 }
 

types/chat1/gregor.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/gregor.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/gregor.avdl
 
 package chat1
 

types/chat1/local.go

@@ -1,14 +1,15 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/local.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/local.avdl
 
 package chat1
 
 import (
+	"errors"
+	"fmt"
+
 	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
 	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 	stellar1 "samhofi.us/x/keybase/v2/types/stellar1"
-	"errors"
-	"fmt"
 )
 
 type VersionKind string
@@ -357,11 +358,24 @@ func (o MessageDelete) DeepCopy() MessageDelete {
 
 type MessageHeadline struct {
 	Headline string                    `codec:"headline" json:"headline"`
+	Emojis   map[string]HarvestedEmoji `codec:"emojis" json:"emojis"`
 }
 
 func (o MessageHeadline) DeepCopy() MessageHeadline {
 	return MessageHeadline{
 		Headline: o.Headline,
+		Emojis: (func(x map[string]HarvestedEmoji) map[string]HarvestedEmoji {
+			if x == nil {
+				return nil
+			}
+			ret := make(map[string]HarvestedEmoji, len(x))
+			for k, v := range x {
+				kCopy := k
+				vCopy := v.DeepCopy()
+				ret[kCopy] = vCopy
+			}
+			return ret
+		})(o.Emojis),
 	}
 }
 
@@ -977,6 +991,7 @@ type MessageAttachment struct {
 	Uploaded     bool                      `codec:"uploaded" json:"uploaded"`
 	UserMentions []KnownUserMention        `codec:"userMentions" json:"userMentions"`
 	TeamMentions []KnownTeamMention        `codec:"teamMentions" json:"teamMentions"`
+	Emojis       map[string]HarvestedEmoji `codec:"emojis" json:"emojis"`
 }
 
 func (o MessageAttachment) DeepCopy() MessageAttachment {
@@ -1029,6 +1044,18 @@ func (o MessageAttachment) DeepCopy() MessageAttachment {
 			}
 			return ret
 		})(o.TeamMentions),
+		Emojis: (func(x map[string]HarvestedEmoji) map[string]HarvestedEmoji {
+			if x == nil {
+				return nil
+			}
+			ret := make(map[string]HarvestedEmoji, len(x))
+			for k, v := range x {
+				kCopy := k
+				vCopy := v.DeepCopy()
+				ret[kCopy] = vCopy
+			}
+			return ret
+		})(o.Emojis),
 	}
 }
 
@@ -3390,6 +3417,7 @@ type ConversationInfoLocal struct {
 	TlfName        string                         `codec:"tlfName" json:"tlfName"`
 	TopicName      string                         `codec:"topicName" json:"topicName"`
 	Headline       string                         `codec:"headline" json:"headline"`
+	HeadlineEmojis []HarvestedEmoji               `codec:"headlineEmojis" json:"headlineEmojis"`
 	SnippetMsg     *MessageUnboxed                `codec:"snippetMsg,omitempty" json:"snippetMsg,omitempty"`
 	PinnedMsg      *ConversationPinnedMessage     `codec:"pinnedMsg,omitempty" json:"pinnedMsg,omitempty"`
 	Draft          *string                        `codec:"draft,omitempty" json:"draft,omitempty"`
@@ -3414,6 +3442,17 @@ func (o ConversationInfoLocal) DeepCopy() ConversationInfoLocal {
 		TlfName:   o.TlfName,
 		TopicName: o.TopicName,
 		Headline:  o.Headline,
+		HeadlineEmojis: (func(x []HarvestedEmoji) []HarvestedEmoji {
+			if x == nil {
+				return nil
+			}
+			ret := make([]HarvestedEmoji, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.HeadlineEmojis),
 		SnippetMsg: (func(x *MessageUnboxed) *MessageUnboxed {
 			if x == nil {
 				return nil
@@ -5909,6 +5948,7 @@ type AdvertiseCommandsParam struct {
 	Typ      BotCommandsAdvertisementTyp `codec:"typ" json:"typ"`
 	Commands []UserBotCommandInput       `codec:"commands" json:"commands"`
 	TeamName *string                     `codec:"teamName,omitempty" json:"teamName,omitempty"`
+	ConvID   *ConversationID             `codec:"convID,omitempty" json:"convID,omitempty"`
 }
 
 func (o AdvertiseCommandsParam) DeepCopy() AdvertiseCommandsParam {
@@ -5932,6 +5972,13 @@ func (o AdvertiseCommandsParam) DeepCopy() AdvertiseCommandsParam {
 			tmp := (*x)
 			return &tmp
 		})(o.TeamName),
+		ConvID: (func(x *ConversationID) *ConversationID {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x).DeepCopy()
+			return &tmp
+		})(o.ConvID),
 	}
 }
 
@@ -6259,8 +6306,21 @@ func (o LastActiveStatusAll) DeepCopy() LastActiveStatusAll {
 	}
 }
 
+type EmojiError struct {
+	Clidisplay string `codec:"clidisplay" json:"clidisplay"`
+	Uidisplay  string `codec:"uidisplay" json:"uidisplay"`
+}
+
+func (o EmojiError) DeepCopy() EmojiError {
+	return EmojiError{
+		Clidisplay: o.Clidisplay,
+		Uidisplay:  o.Uidisplay,
+	}
+}
+
 type AddEmojiRes struct {
 	RateLimit *RateLimit  `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
+	Error     *EmojiError `codec:"error,omitempty" json:"error,omitempty"`
 }
 
 func (o AddEmojiRes) DeepCopy() AddEmojiRes {
@@ -6272,13 +6332,20 @@ func (o AddEmojiRes) DeepCopy() AddEmojiRes {
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.RateLimit),
+		Error: (func(x *EmojiError) *EmojiError {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x).DeepCopy()
+			return &tmp
+		})(o.Error),
 	}
 }
 
 type AddEmojisRes struct {
 	RateLimit        *RateLimit            `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
 	SuccessFilenames []string              `codec:"successFilenames" json:"successFilenames"`
-	FailedFilenames  map[string]string `codec:"failedFilenames" json:"failedFilenames"`
+	FailedFilenames  map[string]EmojiError `codec:"failedFilenames" json:"failedFilenames"`
 }
 
 func (o AddEmojisRes) DeepCopy() AddEmojisRes {
@@ -6301,14 +6368,14 @@ func (o AddEmojisRes) DeepCopy() AddEmojisRes {
 			}
 			return ret
 		})(o.SuccessFilenames),
-		FailedFilenames: (func(x map[string]string) map[string]string {
+		FailedFilenames: (func(x map[string]EmojiError) map[string]EmojiError {
 			if x == nil {
 				return nil
 			}
-			ret := make(map[string]string, len(x))
+			ret := make(map[string]EmojiError, len(x))
 			for k, v := range x {
 				kCopy := k
-				vCopy := v
+				vCopy := v.DeepCopy()
 				ret[kCopy] = vCopy
 			}
 			return ret
@@ -6318,7 +6385,7 @@ func (o AddEmojisRes) DeepCopy() AddEmojisRes {
 
 type AddEmojiAliasRes struct {
 	RateLimit *RateLimit  `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
-	ErrorString *string    `codec:"errorString,omitempty" json:"errorString,omitempty"`
+	Error     *EmojiError `codec:"error,omitempty" json:"error,omitempty"`
 }
 
 func (o AddEmojiAliasRes) DeepCopy() AddEmojiAliasRes {
@@ -6330,13 +6397,13 @@ func (o AddEmojiAliasRes) DeepCopy() AddEmojiAliasRes {
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.RateLimit),
-		ErrorString: (func(x *string) *string {
+		Error: (func(x *EmojiError) *EmojiError {
 			if x == nil {
 				return nil
 			}
-			tmp := (*x)
+			tmp := (*x).DeepCopy()
 			return &tmp
-		})(o.ErrorString),
+		})(o.Error),
 	}
 }
 

types/chat1/notify.go

@@ -1,12 +1,13 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/notify.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/notify.avdl
 
 package chat1
 
 import (
-	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 	"errors"
 	"fmt"
+
+	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 )
 
 type ChatActivitySource int

types/chat1/remote.go

@@ -1,13 +1,14 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/remote.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/remote.avdl
 
 package chat1
 
 import (
-	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
-	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 	"errors"
 	"fmt"
+
+	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
+	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 )
 
 type MessageBoxed struct {
@@ -965,11 +966,24 @@ func (o RemoteBotCommandsAdvertisementTLFID) DeepCopy() RemoteBotCommandsAdverti
 	}
 }
 
+type RemoteBotCommandsAdvertisementConv struct {
+	ConvID          ConversationID `codec:"convID" json:"convID"`
+	AdvertiseConvID ConversationID `codec:"advertiseConvID" json:"advertiseConvID"`
+}
+
+func (o RemoteBotCommandsAdvertisementConv) DeepCopy() RemoteBotCommandsAdvertisementConv {
+	return RemoteBotCommandsAdvertisementConv{
+		ConvID:          o.ConvID.DeepCopy(),
+		AdvertiseConvID: o.AdvertiseConvID.DeepCopy(),
+	}
+}
+
 type RemoteBotCommandsAdvertisement struct {
 	Typ__          BotCommandsAdvertisementTyp           `codec:"typ" json:"typ"`
 	Public__       *RemoteBotCommandsAdvertisementPublic `codec:"public,omitempty" json:"public,omitempty"`
 	TlfidMembers__ *RemoteBotCommandsAdvertisementTLFID  `codec:"tlfidMembers,omitempty" json:"tlfidMembers,omitempty"`
 	TlfidConvs__   *RemoteBotCommandsAdvertisementTLFID  `codec:"tlfidConvs,omitempty" json:"tlfidConvs,omitempty"`
+	Conv__         *RemoteBotCommandsAdvertisementConv   `codec:"conv,omitempty" json:"conv,omitempty"`
 }
 
 func (o *RemoteBotCommandsAdvertisement) Typ() (ret BotCommandsAdvertisementTyp, err error) {
@@ -989,6 +1003,11 @@ func (o *RemoteBotCommandsAdvertisement) Typ() (ret BotCommandsAdvertisementTyp,
 			err = errors.New("unexpected nil value for TlfidConvs__")
 			return ret, err
 		}
+	case BotCommandsAdvertisementTyp_CONV:
+		if o.Conv__ == nil {
+			err = errors.New("unexpected nil value for Conv__")
+			return ret, err
+		}
 	}
 	return o.Typ__, nil
 }
@@ -1023,6 +1042,16 @@ func (o RemoteBotCommandsAdvertisement) TlfidConvs() (res RemoteBotCommandsAdver
 	return *o.TlfidConvs__
 }
 
+func (o RemoteBotCommandsAdvertisement) Conv() (res RemoteBotCommandsAdvertisementConv) {
+	if o.Typ__ != BotCommandsAdvertisementTyp_CONV {
+		panic("wrong case accessed")
+	}
+	if o.Conv__ == nil {
+		return
+	}
+	return *o.Conv__
+}
+
 func NewRemoteBotCommandsAdvertisementWithPublic(v RemoteBotCommandsAdvertisementPublic) RemoteBotCommandsAdvertisement {
 	return RemoteBotCommandsAdvertisement{
 		Typ__:    BotCommandsAdvertisementTyp_PUBLIC,
@@ -1044,6 +1073,13 @@ func NewRemoteBotCommandsAdvertisementWithTlfidConvs(v RemoteBotCommandsAdvertis
 	}
 }
 
+func NewRemoteBotCommandsAdvertisementWithConv(v RemoteBotCommandsAdvertisementConv) RemoteBotCommandsAdvertisement {
+	return RemoteBotCommandsAdvertisement{
+		Typ__:  BotCommandsAdvertisementTyp_CONV,
+		Conv__: &v,
+	}
+}
+
 func (o RemoteBotCommandsAdvertisement) DeepCopy() RemoteBotCommandsAdvertisement {
 	return RemoteBotCommandsAdvertisement{
 		Typ__: o.Typ__.DeepCopy(),
@@ -1068,6 +1104,13 @@ func (o RemoteBotCommandsAdvertisement) DeepCopy() RemoteBotCommandsAdvertisemen
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.TlfidConvs__),
+		Conv__: (func(x *RemoteBotCommandsAdvertisementConv) *RemoteBotCommandsAdvertisementConv {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x).DeepCopy()
+			return &tmp
+		})(o.Conv__),
 	}
 }
 

types/chat1/unfurl.go

@@ -1,12 +1,13 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/unfurl.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/unfurl.avdl
 
 package chat1
 
 import (
-	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
 	"errors"
 	"fmt"
+
+	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
 )
 
 type UnfurlType int

types/gregor1/auth.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/gregor1/auth.avdl
+//   Input file: ../../../../../../client/protocol/avdl/gregor1/auth.avdl
 
 package gregor1
 

types/gregor1/auth_internal.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/gregor1/auth_internal.avdl
+//   Input file: ../../../../../../client/protocol/avdl/gregor1/auth_internal.avdl
 
 package gregor1

types/gregor1/auth_update.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/gregor1/auth_update.avdl
+//   Input file: ../../../../../../client/protocol/avdl/gregor1/auth_update.avdl
 
 package gregor1

types/gregor1/common.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/gregor1/common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/gregor1/common.avdl
 
 package gregor1
 

types/gregor1/incoming.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/gregor1/incoming.avdl
+//   Input file: ../../../../../../client/protocol/avdl/gregor1/incoming.avdl
 
 package gregor1
 

types/gregor1/outgoing.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/gregor1/outgoing.avdl
+//   Input file: ../../../../../../client/protocol/avdl/gregor1/outgoing.avdl
 
 package gregor1

types/gregor1/remind.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/gregor1/remind.avdl
+//   Input file: ../../../../../../client/protocol/avdl/gregor1/remind.avdl
 
 package gregor1

types/keybase1/account.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/account.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/account.avdl
 
 package keybase1
 

types/keybase1/airdrop.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/airdrop.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/airdrop.avdl
 
 package keybase1
 

types/keybase1/apiserver.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/apiserver.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/apiserver.avdl
 
 package keybase1
 

types/keybase1/appstate.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/appstate.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/appstate.avdl
 
 package keybase1
 

types/keybase1/audit.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/audit.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/audit.avdl
 
 package keybase1
 

types/keybase1/avatars.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/avatars.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/avatars.avdl
 
 package keybase1
 

types/keybase1/backend_common.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/backend_common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/backend_common.avdl
 
 package keybase1
 

types/keybase1/badger.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/badger.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/badger.avdl
 
 package keybase1

types/keybase1/block.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/block.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/block.avdl
 
 package keybase1
 

types/keybase1/bot.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/bot.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/bot.avdl
 
 package keybase1
 

types/keybase1/btc.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/btc.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/btc.avdl
 
 package keybase1

types/keybase1/common.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/common.avdl
 
 package keybase1
 
@@ -1076,6 +1076,7 @@ func (e OfflineAvailability) String() string {
 type UserReacji struct {
 	Name             string  `codec:"name" json:"name"`
 	CustomAddr       *string `codec:"customAddr,omitempty" json:"customAddr,omitempty"`
+	CustomAddrNoAnim *string `codec:"customAddrNoAnim,omitempty" json:"customAddrNoAnim,omitempty"`
 }
 
 func (o UserReacji) DeepCopy() UserReacji {
@@ -1088,13 +1089,52 @@ func (o UserReacji) DeepCopy() UserReacji {
 			tmp := (*x)
 			return &tmp
 		})(o.CustomAddr),
+		CustomAddrNoAnim: (func(x *string) *string {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x)
+			return &tmp
+		})(o.CustomAddrNoAnim),
 	}
 }
 
 type ReacjiSkinTone int
 
-func (o ReacjiSkinTone) DeepCopy() ReacjiSkinTone {
+const (
-	return o
+	ReacjiSkinTone_NONE      ReacjiSkinTone = 0
+	ReacjiSkinTone_SKINTONE1 ReacjiSkinTone = 1
+	ReacjiSkinTone_SKINTONE2 ReacjiSkinTone = 2
+	ReacjiSkinTone_SKINTONE3 ReacjiSkinTone = 3
+	ReacjiSkinTone_SKINTONE4 ReacjiSkinTone = 4
+	ReacjiSkinTone_SKINTONE5 ReacjiSkinTone = 5
+)
+
+func (o ReacjiSkinTone) DeepCopy() ReacjiSkinTone { return o }
+
+var ReacjiSkinToneMap = map[string]ReacjiSkinTone{
+	"NONE":      0,
+	"SKINTONE1": 1,
+	"SKINTONE2": 2,
+	"SKINTONE3": 3,
+	"SKINTONE4": 4,
+	"SKINTONE5": 5,
+}
+
+var ReacjiSkinToneRevMap = map[ReacjiSkinTone]string{
+	0: "NONE",
+	1: "SKINTONE1",
+	2: "SKINTONE2",
+	3: "SKINTONE3",
+	4: "SKINTONE4",
+	5: "SKINTONE5",
+}
+
+func (e ReacjiSkinTone) String() string {
+	if v, ok := ReacjiSkinToneRevMap[e]; ok {
+		return v
+	}
+	return fmt.Sprintf("%v", int(e))
 }
 
 type UserReacjis struct {
@@ -1153,13 +1193,3 @@ func (e WotStatusType) String() string {
 	}
 	return fmt.Sprintf("%v", int(e))
 }
-
-type GenericError struct {
-	Message string `codec:"message" json:"message"`
-}
-
-func (o GenericError) DeepCopy() GenericError {
-	return GenericError{
-		Message: o.Message,
-	}
-}

types/keybase1/config.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/config.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/config.avdl
 
 package keybase1
 

types/keybase1/constants.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/constants.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/constants.avdl
 
 package keybase1
 

types/keybase1/contacts.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/contacts.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/contacts.avdl
 
 package keybase1
 

types/keybase1/crypto.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/crypto.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/crypto.avdl
 
 package keybase1
 

types/keybase1/cryptocurrency.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/cryptocurrency.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/cryptocurrency.avdl
 
 package keybase1
 

types/keybase1/ctl.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/ctl.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/ctl.avdl
 
 package keybase1
 

types/keybase1/debugging.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/debugging.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/debugging.avdl
 
 package keybase1
 

types/keybase1/delegate_ui_ctl.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/delegate_ui_ctl.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/delegate_ui_ctl.avdl
 
 package keybase1

types/keybase1/device.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/device.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/device.avdl
 
 package keybase1
 

types/keybase1/emails.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/emails.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/emails.avdl
 
 package keybase1
 

types/keybase1/ephemeral.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/ephemeral.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/ephemeral.avdl
 
 package keybase1
 

types/keybase1/favorite.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/favorite.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/favorite.avdl
 
 package keybase1
 

types/keybase1/featured_bot.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/featured_bot.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/featured_bot.avdl
 
 package keybase1
 

types/keybase1/fs.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/fs.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/fs.avdl
 
 package keybase1
 

types/keybase1/git.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/git.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/git.avdl
 
 package keybase1
 

types/keybase1/gpg_common.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/gpg_common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/gpg_common.avdl
 
 package keybase1
 

types/keybase1/gpg_ui.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/gpg_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/gpg_ui.avdl
 
 package keybase1
 

types/keybase1/gregor.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/gregor.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/gregor.avdl
 
 package keybase1

types/keybase1/gregor_ui.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/gregor_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/gregor_ui.avdl
 
 package keybase1
 

types/keybase1/home.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/home.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/home.avdl
 
 package keybase1
 
@@ -298,19 +298,19 @@ const (
 	HomeScreenTodoType_PROOF                   HomeScreenTodoType = 2
 	HomeScreenTodoType_DEVICE                  HomeScreenTodoType = 3
 	HomeScreenTodoType_FOLLOW                  HomeScreenTodoType = 4
-	HomeScreenTodoType_CHAT                    HomeScreenTodoType = 5
 	HomeScreenTodoType_PAPERKEY                HomeScreenTodoType = 6
 	HomeScreenTodoType_TEAM                    HomeScreenTodoType = 7
 	HomeScreenTodoType_FOLDER                  HomeScreenTodoType = 8
 	HomeScreenTodoType_GIT_REPO                HomeScreenTodoType = 9
 	HomeScreenTodoType_TEAM_SHOWCASE           HomeScreenTodoType = 10
-	HomeScreenTodoType_AVATAR_USER             HomeScreenTodoType = 11
 	HomeScreenTodoType_AVATAR_TEAM             HomeScreenTodoType = 12
 	HomeScreenTodoType_ADD_PHONE_NUMBER        HomeScreenTodoType = 18
 	HomeScreenTodoType_VERIFY_ALL_PHONE_NUMBER HomeScreenTodoType = 19
 	HomeScreenTodoType_VERIFY_ALL_EMAIL        HomeScreenTodoType = 20
 	HomeScreenTodoType_LEGACY_EMAIL_VISIBILITY HomeScreenTodoType = 21
 	HomeScreenTodoType_ADD_EMAIL               HomeScreenTodoType = 22
+	HomeScreenTodoType_AVATAR_USER             HomeScreenTodoType = 23
+	HomeScreenTodoType_CHAT                    HomeScreenTodoType = 24
 	HomeScreenTodoType_ANNONCEMENT_PLACEHOLDER HomeScreenTodoType = 10000
 )
 
@@ -322,19 +322,19 @@ var HomeScreenTodoTypeMap = map[string]HomeScreenTodoType{
 	"PROOF":                   2,
 	"DEVICE":                  3,
 	"FOLLOW":                  4,
-	"CHAT":                    5,
 	"PAPERKEY":                6,
 	"TEAM":                    7,
 	"FOLDER":                  8,
 	"GIT_REPO":                9,
 	"TEAM_SHOWCASE":           10,
-	"AVATAR_USER":             11,
 	"AVATAR_TEAM":             12,
 	"ADD_PHONE_NUMBER":        18,
 	"VERIFY_ALL_PHONE_NUMBER": 19,
 	"VERIFY_ALL_EMAIL":        20,
 	"LEGACY_EMAIL_VISIBILITY": 21,
 	"ADD_EMAIL":               22,
+	"AVATAR_USER":             23,
+	"CHAT":                    24,
 	"ANNONCEMENT_PLACEHOLDER": 10000,
 }
 
@@ -344,19 +344,19 @@ var HomeScreenTodoTypeRevMap = map[HomeScreenTodoType]string{
 	2:     "PROOF",
 	3:     "DEVICE",
 	4:     "FOLLOW",
-	5:     "CHAT",
 	6:     "PAPERKEY",
 	7:     "TEAM",
 	8:     "FOLDER",
 	9:     "GIT_REPO",
 	10:    "TEAM_SHOWCASE",
-	11:    "AVATAR_USER",
 	12:    "AVATAR_TEAM",
 	18:    "ADD_PHONE_NUMBER",
 	19:    "VERIFY_ALL_PHONE_NUMBER",
 	20:    "VERIFY_ALL_EMAIL",
 	21:    "LEGACY_EMAIL_VISIBILITY",
 	22:    "ADD_EMAIL",
+	23:    "AVATAR_USER",
+	24:    "CHAT",
 	10000: "ANNONCEMENT_PLACEHOLDER",
 }
 

types/keybase1/home_ui.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/home_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/home_ui.avdl
 
 package keybase1

types/keybase1/identify.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/identify.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/identify.avdl
 
 package keybase1
 

types/keybase1/identify3.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/identify3.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/identify3.avdl
 
 package keybase1

types/keybase1/identify3_common.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/identify3_common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/identify3_common.avdl
 
 package keybase1
 

types/keybase1/identify3_ui.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/identify3_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/identify3_ui.avdl
 
 package keybase1
 

types/keybase1/identify_common.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/identify_common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/identify_common.avdl
 
 package keybase1
 

types/keybase1/identify_ui.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/identify_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/identify_ui.avdl
 
 package keybase1
 

types/keybase1/implicit_team_migration.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/implicit_team_migration.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/implicit_team_migration.avdl
 
 package keybase1

types/keybase1/incoming-share.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/incoming-share.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/incoming-share.avdl
 
 package keybase1
 
@@ -41,8 +41,8 @@ func (e IncomingShareType) String() string {
 
 type IncomingShareItem struct {
 	Type          IncomingShareType `codec:"type" json:"type"`
-	OriginalPath  string            `codec:"originalPath" json:"originalPath"`
+	OriginalPath  *string           `codec:"originalPath,omitempty" json:"originalPath,omitempty"`
-	OriginalSize  int               `codec:"originalSize" json:"originalSize"`
+	OriginalSize  *int              `codec:"originalSize,omitempty" json:"originalSize,omitempty"`
 	ScaledPath    *string           `codec:"scaledPath,omitempty" json:"scaledPath,omitempty"`
 	ScaledSize    *int              `codec:"scaledSize,omitempty" json:"scaledSize,omitempty"`
 	ThumbnailPath *string           `codec:"thumbnailPath,omitempty" json:"thumbnailPath,omitempty"`
@@ -52,8 +52,20 @@ type IncomingShareItem struct {
 func (o IncomingShareItem) DeepCopy() IncomingShareItem {
 	return IncomingShareItem{
 		Type: o.Type.DeepCopy(),
-		OriginalPath: o.OriginalPath,
+		OriginalPath: (func(x *string) *string {
-		OriginalSize: o.OriginalSize,
+			if x == nil {
+				return nil
+			}
+			tmp := (*x)
+			return &tmp
+		})(o.OriginalPath),
+		OriginalSize: (func(x *int) *int {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x)
+			return &tmp
+		})(o.OriginalSize),
 		ScaledPath: (func(x *string) *string {
 			if x == nil {
 				return nil

types/keybase1/install.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/install.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/install.avdl
 
 package keybase1
 

types/keybase1/invite_friends.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/invite_friends.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/invite_friends.avdl
 
 package keybase1
 
@@ -8,6 +8,7 @@ type InviteCounts struct {
 	PercentageChange float64 `codec:"percentageChange" json:"percentageChange"`
 	ShowNumInvites   bool    `codec:"showNumInvites" json:"showNumInvites"`
 	ShowFire         bool    `codec:"showFire" json:"showFire"`
+	TooltipMarkdown  string  `codec:"tooltipMarkdown" json:"tooltipMarkdown"`
 }
 
 func (o InviteCounts) DeepCopy() InviteCounts {
@@ -16,6 +17,7 @@ func (o InviteCounts) DeepCopy() InviteCounts {
 		PercentageChange: o.PercentageChange,
 		ShowNumInvites:   o.ShowNumInvites,
 		ShowFire:         o.ShowFire,
+		TooltipMarkdown:  o.TooltipMarkdown,
 	}
 }
 

types/keybase1/kbfs.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/kbfs.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/kbfs.avdl
 
 package keybase1
 

types/keybase1/kbfs_common.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/kbfs_common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/kbfs_common.avdl
 
 package keybase1
 

types/keybase1/kbfs_git.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/kbfs_git.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/kbfs_git.avdl
 
 package keybase1
 

types/keybase1/kbfsmount.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/kbfsmount.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/kbfsmount.avdl
 
 package keybase1

types/keybase1/kex2provisionee.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/kex2provisionee.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/kex2provisionee.avdl
 
 package keybase1
 

types/keybase1/kex2provisionee2.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/kex2provisionee2.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/kex2provisionee2.avdl
 
 package keybase1
 

types/keybase1/kex2provisioner.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/kex2provisioner.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/kex2provisioner.avdl
 
 package keybase1

types/keybase1/kvstore.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/kvstore.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/kvstore.avdl
 
 package keybase1
 

types/keybase1/log.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/log.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/log.avdl
 
 package keybase1

types/keybase1/log_ui.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/log_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/log_ui.avdl
 
 package keybase1

types/keybase1/login.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/login.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/login.avdl
 
 package keybase1
 

types/keybase1/login_ui.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/login_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/login_ui.avdl
 
 package keybase1
 

types/keybase1/logsend.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/logsend.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/logsend.avdl
 
 package keybase1

types/keybase1/merkle.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/merkle.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/merkle.avdl
 
 package keybase1
 

types/keybase1/merkle_store.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/merkle_store.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/merkle_store.avdl
 
 package keybase1
 

types/keybase1/metadata.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/metadata.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/metadata.avdl
 
 package keybase1
 

types/keybase1/metadata_update.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/metadata_update.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/metadata_update.avdl
 
 package keybase1
 

types/keybase1/network_stats.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/network_stats.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/network_stats.avdl
 
 package keybase1
 

types/keybase1/notify_app.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_app.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_app.avdl
 
 package keybase1

types/keybase1/notify_audit.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_audit.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_audit.avdl
 
 package keybase1

types/keybase1/notify_badges.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_badges.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_badges.avdl
 
 package keybase1
 

types/keybase1/notify_can_user_perform.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_can_user_perform.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_can_user_perform.avdl
 
 package keybase1

types/keybase1/notify_ctl.go

@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_ctl.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_ctl.avdl
 
 package keybase1
 
@@ -35,6 +35,7 @@ type NotificationChannels struct {
 	Runtimestats         bool `codec:"runtimestats" json:"runtimestats"`
 	FeaturedBots         bool `codec:"featuredBots" json:"featuredBots"`
 	Saltpack             bool `codec:"saltpack" json:"saltpack"`
+	AllowChatNotifySkips bool `codec:"allowChatNotifySkips" json:"allowChatNotifySkips"`
 }
 
 func (o NotificationChannels) DeepCopy() NotificationChannels {
@@ -70,5 +71,6 @@ func (o NotificationChannels) DeepCopy() NotificationChannels {
 		Runtimestats:         o.Runtimestats,
 		FeaturedBots:         o.FeaturedBots,
 		Saltpack:             o.Saltpack,
+		AllowChatNotifySkips: o.AllowChatNotifySkips,
 	}
 }

types/keybase1/notify_device_clone.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_device_clone.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_device_clone.avdl
 
 package keybase1

types/keybase1/notify_email.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_email.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_email.avdl
 
 package keybase1

types/keybase1/notify_ephemeral.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_ephemeral.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_ephemeral.avdl
 
 package keybase1

types/keybase1/notify_favorites.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_favorites.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_favorites.avdl
 
 package keybase1

types/keybase1/notify_featuredbots.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_featuredbots.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_featuredbots.avdl
 
 package keybase1

types/keybase1/notify_fs.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_fs.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_fs.avdl
 
 package keybase1

types/keybase1/notify_fs_request.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_fs_request.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_fs_request.avdl
 
 package keybase1

types/keybase1/notify_invite_friends.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_invite_friends.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_invite_friends.avdl
 
 package keybase1

types/keybase1/notify_keyfamily.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_keyfamily.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_keyfamily.avdl
 
 package keybase1

types/keybase1/notify_paperkey.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_paperkey.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_paperkey.avdl
 
 package keybase1

types/keybase1/notify_pgp.go

@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_pgp.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_pgp.avdl
 
 package keybase1