use v2 types

chat.go

@@ -5,9 +5,11 @@ 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"
 )
 
@@ -36,15 +38,7 @@ func getNewMessages(k *Keybase, subs *subscriptionChannels, execOptions []string
 		execString = append(execString, execOptions...)
 	}
 	for {
-		cmd := make([]string, 0)
+		execCmd := exec.Command(k.Path, execString...)
-
-		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)
@@ -707,10 +701,10 @@ func (k *Keybase) ClearCommands() error {
 }
 
 // ListMembers returns member information for a channel or conversation
-func (k *Keybase) ListMembers(options ListMembersOptions) (chat1.ChatMembersDetails, error) {
+func (k *Keybase) ListMembers(options ListMembersOptions) (keybase1.TeamDetails, error) {
 	type res struct {
-		Result chat1.ChatMembersDetails `json:"result"`
+		Result keybase1.TeamDetails `json:"result"`
-		Error  *Error                   `json:"error,omitempty"`
+		Error  *Error               `json:"error,omitempty"`
 	}
 
 	var r res
@@ -737,7 +731,7 @@ func (k *Keybase) ListMembers(options ListMembersOptions) (chat1.ChatMembersDeta
 }
 
 // ListMembersOfChannel returns member information for a channel
-func (k *Keybase) ListMembersOfChannel(channel chat1.ChatChannel) (chat1.ChatMembersDetails, error) {
+func (k *Keybase) ListMembersOfChannel(channel chat1.ChatChannel) (keybase1.TeamDetails, error) {
 	opts := ListMembersOptions{
 		Channel: channel,
 	}
@@ -745,43 +739,9 @@ func (k *Keybase) ListMembersOfChannel(channel chat1.ChatChannel) (chat1.ChatMem
 }
 
 // ListMembersOfConversation returns member information for a conversation
-func (k *Keybase) ListMembersOfConversation(convID chat1.ConvIDStr) (chat1.ChatMembersDetails, error) {
+func (k *Keybase) ListMembersOfConversation(convID chat1.ConvIDStr) (keybase1.TeamDetails, 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
-}

go.mod

@@ -1,3 +1,3 @@
-module samhofi.us/x/keybase
+module samhofi.us/x/keybase/v2
 
 go 1.13

keybase.go

@@ -9,9 +9,6 @@ import (
 	"samhofi.us/x/keybase/v2/types/chat1"
 )
 
-// Used for testing
-var execCommand = exec.Command
-
 // Possible MemberTypes
 const (
 	TEAM string = "team"
@@ -24,33 +21,13 @@ 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.ExePath = "keybase"
+		k.Path = "keybase"
 	} else {
-		k.ExePath = path[0]
+		k.Path = path[0]
 	}
 
 	s := k.status()
@@ -65,15 +42,7 @@ func NewKeybase(path ...string) *Keybase {
 
 // Exec executes the given Keybase command
 func (k *Keybase) Exec(command ...string) ([]byte, error) {
-	cmd := make([]string, 0)
+	out, err := exec.Command(k.Path, command...).Output()
-
-	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
 	}

types.go

@@ -20,37 +20,6 @@ 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"`
 }
@@ -114,7 +83,6 @@ 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 {
@@ -239,24 +207,6 @@ 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"`
@@ -1004,8 +954,7 @@ type userBlocks struct {
 
 // Keybase holds basic information about the local Keybase executable
 type Keybase struct {
-	HomePath string
+	Path     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,7 +942,6 @@ 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 {
@@ -960,7 +959,6 @@ 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,15 +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/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,15 +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/common.avdl
+//   Input file: ../client/protocol/avdl/chat1/common.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 ThreadID []byte
@@ -1370,7 +1368,6 @@ 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 {
@@ -1470,13 +1467,6 @@ 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),
 	}
 }
 
@@ -2491,7 +2481,6 @@ 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 }
@@ -2500,14 +2489,12 @@ 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 {
@@ -2559,97 +2546,3 @@ 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,13 +1,12 @@
 // 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
@@ -275,12 +274,9 @@ 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 {
@@ -289,9 +285,7 @@ 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 {
@@ -300,13 +294,6 @@ 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,15 +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/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,25 +356,12 @@ func (o MessageDelete) DeepCopy() MessageDelete {
 }
 
 type MessageHeadline struct {
-	Headline string                    `codec:"headline" json:"headline"`
+	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),
 	}
 }
 
@@ -984,14 +970,13 @@ func (o MessageDeleteHistory) DeepCopy() MessageDeleteHistory {
 }
 
 type MessageAttachment struct {
-	Object       Asset                     `codec:"object" json:"object"`
+	Object       Asset              `codec:"object" json:"object"`
-	Preview      *Asset                    `codec:"preview,omitempty" json:"preview,omitempty"`
+	Preview      *Asset             `codec:"preview,omitempty" json:"preview,omitempty"`
-	Previews     []Asset                   `codec:"previews" json:"previews"`
+	Previews     []Asset            `codec:"previews" json:"previews"`
-	Metadata     []byte                    `codec:"metadata" json:"metadata"`
+	Metadata     []byte             `codec:"metadata" json:"metadata"`
-	Uploaded     bool                      `codec:"uploaded" json:"uploaded"`
+	Uploaded     bool               `codec:"uploaded" json:"uploaded"`
-	UserMentions []KnownUserMention        `codec:"userMentions" json:"userMentions"`
+	UserMentions []KnownUserMention `codec:"userMentions" json:"userMentions"`
-	TeamMentions []KnownTeamMention        `codec:"teamMentions" json:"teamMentions"`
+	TeamMentions []KnownTeamMention `codec:"teamMentions" json:"teamMentions"`
-	Emojis       map[string]HarvestedEmoji `codec:"emojis" json:"emojis"`
 }
 
 func (o MessageAttachment) DeepCopy() MessageAttachment {
@@ -1044,18 +1029,6 @@ 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),
 	}
 }
 
@@ -3412,27 +3385,26 @@ func (o ConversationPinnedMessage) DeepCopy() ConversationPinnedMessage {
 }
 
 type ConversationInfoLocal struct {
-	Id             ConversationID                 `codec:"id" json:"id"`
+	Id            ConversationID                 `codec:"id" json:"id"`
-	Triple         ConversationIDTriple           `codec:"triple" json:"triple"`
+	Triple        ConversationIDTriple           `codec:"triple" json:"triple"`
-	TlfName        string                         `codec:"tlfName" json:"tlfName"`
+	TlfName       string                         `codec:"tlfName" json:"tlfName"`
-	TopicName      string                         `codec:"topicName" json:"topicName"`
+	TopicName     string                         `codec:"topicName" json:"topicName"`
-	Headline       string                         `codec:"headline" json:"headline"`
+	Headline      string                         `codec:"headline" json:"headline"`
-	HeadlineEmojis []HarvestedEmoji               `codec:"headlineEmojis" json:"headlineEmojis"`
+	SnippetMsg    *MessageUnboxed                `codec:"snippetMsg,omitempty" json:"snippetMsg,omitempty"`
-	SnippetMsg     *MessageUnboxed                `codec:"snippetMsg,omitempty" json:"snippetMsg,omitempty"`
+	PinnedMsg     *ConversationPinnedMessage     `codec:"pinnedMsg,omitempty" json:"pinnedMsg,omitempty"`
-	PinnedMsg      *ConversationPinnedMessage     `codec:"pinnedMsg,omitempty" json:"pinnedMsg,omitempty"`
+	Draft         *string                        `codec:"draft,omitempty" json:"draft,omitempty"`
-	Draft          *string                        `codec:"draft,omitempty" json:"draft,omitempty"`
+	Visibility    keybase1.TLFVisibility         `codec:"visibility" json:"visibility"`
-	Visibility     keybase1.TLFVisibility         `codec:"visibility" json:"visibility"`
+	IsDefaultConv bool                           `codec:"isDefaultConv" json:"isDefaultConv"`
-	IsDefaultConv  bool                           `codec:"isDefaultConv" json:"isDefaultConv"`
+	Status        ConversationStatus             `codec:"status" json:"status"`
-	Status         ConversationStatus             `codec:"status" json:"status"`
+	MembersType   ConversationMembersType        `codec:"membersType" json:"membersType"`
-	MembersType    ConversationMembersType        `codec:"membersType" json:"membersType"`
+	MemberStatus  ConversationMemberStatus       `codec:"memberStatus" json:"memberStatus"`
-	MemberStatus   ConversationMemberStatus       `codec:"memberStatus" json:"memberStatus"`
+	TeamType      TeamType                       `codec:"teamType" json:"teamType"`
-	TeamType       TeamType                       `codec:"teamType" json:"teamType"`
+	Existence     ConversationExistence          `codec:"existence" json:"existence"`
-	Existence      ConversationExistence          `codec:"existence" json:"existence"`
+	Version       ConversationVers               `codec:"version" json:"version"`
-	Version        ConversationVers               `codec:"version" json:"version"`
+	LocalVersion  LocalConversationVers          `codec:"localVersion" json:"localVersion"`
-	LocalVersion   LocalConversationVers          `codec:"localVersion" json:"localVersion"`
+	Participants  []ConversationLocalParticipant `codec:"participants" json:"participants"`
-	Participants   []ConversationLocalParticipant `codec:"participants" json:"participants"`
+	FinalizeInfo  *ConversationFinalizeInfo      `codec:"finalizeInfo,omitempty" json:"finalizeInfo,omitempty"`
-	FinalizeInfo   *ConversationFinalizeInfo      `codec:"finalizeInfo,omitempty" json:"finalizeInfo,omitempty"`
+	ResetNames    []string                       `codec:"resetNames" json:"resetNames"`
-	ResetNames     []string                       `codec:"resetNames" json:"resetNames"`
 }
 
 func (o ConversationInfoLocal) DeepCopy() ConversationInfoLocal {
@@ -3442,17 +3414,6 @@ 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
@@ -5948,7 +5909,6 @@ 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 {
@@ -5972,13 +5932,6 @@ 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),
 	}
 }
 
@@ -6306,21 +6259,8 @@ 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"`
+	RateLimit *RateLimit `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
-	Error     *EmojiError `codec:"error,omitempty" json:"error,omitempty"`
 }
 
 func (o AddEmojiRes) DeepCopy() AddEmojiRes {
@@ -6332,20 +6272,13 @@ 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"`
+	RateLimit        *RateLimit        `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
-	SuccessFilenames []string              `codec:"successFilenames" json:"successFilenames"`
+	SuccessFilenames []string          `codec:"successFilenames" json:"successFilenames"`
-	FailedFilenames  map[string]EmojiError `codec:"failedFilenames" json:"failedFilenames"`
+	FailedFilenames  map[string]string `codec:"failedFilenames" json:"failedFilenames"`
 }
 
 func (o AddEmojisRes) DeepCopy() AddEmojisRes {
@@ -6368,14 +6301,14 @@ func (o AddEmojisRes) DeepCopy() AddEmojisRes {
 			}
 			return ret
 		})(o.SuccessFilenames),
-		FailedFilenames: (func(x map[string]EmojiError) map[string]EmojiError {
+		FailedFilenames: (func(x map[string]string) map[string]string {
 			if x == nil {
 				return nil
 			}
-			ret := make(map[string]EmojiError, len(x))
+			ret := make(map[string]string, len(x))
 			for k, v := range x {
 				kCopy := k
-				vCopy := v.DeepCopy()
+				vCopy := v
 				ret[kCopy] = vCopy
 			}
 			return ret
@@ -6384,8 +6317,8 @@ func (o AddEmojisRes) DeepCopy() AddEmojisRes {
 }
 
 type AddEmojiAliasRes struct {
-	RateLimit *RateLimit  `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
+	RateLimit   *RateLimit `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
-	Error     *EmojiError `codec:"error,omitempty" json:"error,omitempty"`
+	ErrorString *string    `codec:"errorString,omitempty" json:"errorString,omitempty"`
 }
 
 func (o AddEmojiAliasRes) DeepCopy() AddEmojiAliasRes {
@@ -6397,13 +6330,13 @@ func (o AddEmojiAliasRes) DeepCopy() AddEmojiAliasRes {
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.RateLimit),
-		Error: (func(x *EmojiError) *EmojiError {
+		ErrorString: (func(x *string) *string {
 			if x == nil {
 				return nil
 			}
-			tmp := (*x).DeepCopy()
+			tmp := (*x)
 			return &tmp
-		})(o.Error),
+		})(o.ErrorString),
 	}
 }
 

types/chat1/notify.go

@@ -1,13 +1,12 @@
 // 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,14 +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/remote.avdl
+//   Input file: ../client/protocol/avdl/chat1/remote.avdl
 
 package chat1
 
 import (
-	"errors"
-	"fmt"
-
 	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
 	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
+	"errors"
+	"fmt"
 )
 
 type MessageBoxed struct {
@@ -966,24 +965,11 @@ 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) {
@@ -1003,11 +989,6 @@ 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
 }
@@ -1042,16 +1023,6 @@ 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,
@@ -1073,13 +1044,6 @@ 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(),
@@ -1104,13 +1068,6 @@ 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,13 +1,12 @@
 // 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

@@ -0,0 +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
+
+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
 
@@ -1074,9 +1074,8 @@ func (e OfflineAvailability) String() string {
 }
 
 type UserReacji struct {
-	Name             string  `codec:"name" json:"name"`
+	Name       string  `codec:"name" json:"name"`
-	CustomAddr       *string `codec:"customAddr,omitempty" json:"customAddr,omitempty"`
+	CustomAddr *string `codec:"customAddr,omitempty" json:"customAddr,omitempty"`
-	CustomAddrNoAnim *string `codec:"customAddrNoAnim,omitempty" json:"customAddrNoAnim,omitempty"`
 }
 
 func (o UserReacji) DeepCopy() UserReacji {
@@ -1089,52 +1088,13 @@ 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
 
-const (
+func (o ReacjiSkinTone) DeepCopy() ReacjiSkinTone {
-	ReacjiSkinTone_NONE      ReacjiSkinTone = 0
+	return o
-	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 {
@@ -1193,3 +1153,13 @@ 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

@@ -0,0 +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
+
+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

@@ -0,0 +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
+
+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

@@ -0,0 +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
+
+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

@@ -0,0 +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
+
+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/home_ui.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,omitempty" json:"originalPath,omitempty"`
+	OriginalPath  string            `codec:"originalPath" json:"originalPath"`
-	OriginalSize  *int              `codec:"originalSize,omitempty" json:"originalSize,omitempty"`
+	OriginalSize  int               `codec:"originalSize" json:"originalSize"`
 	ScaledPath    *string           `codec:"scaledPath,omitempty" json:"scaledPath,omitempty"`
 	ScaledSize    *int              `codec:"scaledSize,omitempty" json:"scaledSize,omitempty"`
 	ThumbnailPath *string           `codec:"thumbnailPath,omitempty" json:"thumbnailPath,omitempty"`
@@ -51,21 +51,9 @@ type IncomingShareItem struct {
 
 func (o IncomingShareItem) DeepCopy() IncomingShareItem {
 	return IncomingShareItem{
-		Type: o.Type.DeepCopy(),
+		Type:         o.Type.DeepCopy(),
-		OriginalPath: (func(x *string) *string {
+		OriginalPath: o.OriginalPath,
-			if x == nil {
+		OriginalSize: o.OriginalSize,
-				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,7 +8,6 @@ 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 {
@@ -17,7 +16,6 @@ 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

@@ -0,0 +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
+
+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

@@ -0,0 +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
+
+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

@@ -0,0 +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
+
+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

@@ -0,0 +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
+
+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

@@ -0,0 +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
+
+package keybase1

types/keybase1/notify_audit.go

@@ -0,0 +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
+
+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/gregor.avdl
+//   Input file: ../client/protocol/avdl/keybase1/notify_can_user_perform.avdl
 
 package keybase1

types/keybase1/notify_ctl.go

@@ -0,0 +1,74 @@
+// 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
+
+package keybase1
+
+type NotificationChannels struct {
+	Session          bool `codec:"session" json:"session"`
+	Users            bool `codec:"users" json:"users"`
+	Kbfs             bool `codec:"kbfs" json:"kbfs"`
+	Kbfsdesktop      bool `codec:"kbfsdesktop" json:"kbfsdesktop"`
+	Kbfslegacy       bool `codec:"kbfslegacy" json:"kbfslegacy"`
+	Kbfssubscription bool `codec:"kbfssubscription" json:"kbfssubscription"`
+	Tracking         bool `codec:"tracking" json:"tracking"`
+	Favorites        bool `codec:"favorites" json:"favorites"`
+	Paperkeys        bool `codec:"paperkeys" json:"paperkeys"`
+	Keyfamily        bool `codec:"keyfamily" json:"keyfamily"`
+	Service          bool `codec:"service" json:"service"`
+	App              bool `codec:"app" json:"app"`
+	Chat             bool `codec:"chat" json:"chat"`
+	PGP              bool `codec:"pgp" json:"pgp"`
+	Kbfsrequest      bool `codec:"kbfsrequest" json:"kbfsrequest"`
+	Badges           bool `codec:"badges" json:"badges"`
+	Reachability     bool `codec:"reachability" json:"reachability"`
+	Team             bool `codec:"team" json:"team"`
+	Ephemeral        bool `codec:"ephemeral" json:"ephemeral"`
+	Teambot          bool `codec:"teambot" json:"teambot"`
+	Chatkbfsedits    bool `codec:"chatkbfsedits" json:"chatkbfsedits"`
+	Chatdev          bool `codec:"chatdev" json:"chatdev"`
+	Chatemoji        bool `codec:"chatemoji" json:"chatemoji"`
+	Chatemojicross   bool `codec:"chatemojicross" json:"chatemojicross"`
+	Deviceclone      bool `codec:"deviceclone" json:"deviceclone"`
+	Chatattachments  bool `codec:"chatattachments" json:"chatattachments"`
+	Wallet           bool `codec:"wallet" json:"wallet"`
+	Audit            bool `codec:"audit" json:"audit"`
+	Runtimestats     bool `codec:"runtimestats" json:"runtimestats"`
+	FeaturedBots     bool `codec:"featuredBots" json:"featuredBots"`
+	Saltpack         bool `codec:"saltpack" json:"saltpack"`
+}
+
+func (o NotificationChannels) DeepCopy() NotificationChannels {
+	return NotificationChannels{
+		Session:          o.Session,
+		Users:            o.Users,
+		Kbfs:             o.Kbfs,
+		Kbfsdesktop:      o.Kbfsdesktop,
+		Kbfslegacy:       o.Kbfslegacy,
+		Kbfssubscription: o.Kbfssubscription,
+		Tracking:         o.Tracking,
+		Favorites:        o.Favorites,
+		Paperkeys:        o.Paperkeys,
+		Keyfamily:        o.Keyfamily,
+		Service:          o.Service,
+		App:              o.App,
+		Chat:             o.Chat,
+		PGP:              o.PGP,
+		Kbfsrequest:      o.Kbfsrequest,
+		Badges:           o.Badges,
+		Reachability:     o.Reachability,
+		Team:             o.Team,
+		Ephemeral:        o.Ephemeral,
+		Teambot:          o.Teambot,
+		Chatkbfsedits:    o.Chatkbfsedits,
+		Chatdev:          o.Chatdev,
+		Chatemoji:        o.Chatemoji,
+		Chatemojicross:   o.Chatemojicross,
+		Deviceclone:      o.Deviceclone,
+		Chatattachments:  o.Chatattachments,
+		Wallet:           o.Wallet,
+		Audit:            o.Audit,
+		Runtimestats:     o.Runtimestats,
+		FeaturedBots:     o.FeaturedBots,
+		Saltpack:         o.Saltpack,
+	}
+}

types/keybase1/notify_device_clone.go

@@ -0,0 +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
+
+package keybase1

types/keybase1/notify_email.go

@@ -0,0 +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
+
+package keybase1

types/keybase1/notify_ephemeral.go

@@ -0,0 +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
+
+package keybase1

types/keybase1/notify_favorites.go

@@ -0,0 +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
+
+package keybase1

types/keybase1/notify_featuredbots.go

@@ -0,0 +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
+
+package keybase1

types/keybase1/notify_fs.go

@@ -0,0 +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
+
+package keybase1

types/keybase1/notify_fs_request.go

@@ -0,0 +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
+
+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/badger.avdl
+//   Input file: ../client/protocol/avdl/keybase1/notify_invite_friends.avdl
 
 package keybase1