Version 2

chat.go

@@ -5,10 +5,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"os/exec"
 	"time"
 
-	"samhofi.us/x/keybase/v2/types/chat1"
+	"samhofi.us/x/keybase/types/chat1"
-	"samhofi.us/x/keybase/v2/types/stellar1"
+	"samhofi.us/x/keybase/types/keybase1"
+	"samhofi.us/x/keybase/types/stellar1"
 )
 
 // Creates a string of a json-encoded channel to pass to keybase chat api-listen --filter-channel
@@ -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
-}

docs_test.go

@@ -1,6 +1,6 @@
 package keybase
 
-import "samhofi.us/x/keybase/v2/types/chat1"
+import "samhofi.us/x/keybase/types/chat1"
 
 func ExampleKeybase_AdvertiseCommands() {
 	var k = NewKeybase()

go.mod

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

keybase.go

@@ -6,12 +6,9 @@ import (
 	"os/exec"
 	"strings"
 
-	"samhofi.us/x/keybase/v2/types/chat1"
+	"samhofi.us/x/keybase/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
 	}

kvstore.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"samhofi.us/x/keybase/v2/types/keybase1"
+	"samhofi.us/x/keybase/types/keybase1"
 )
 
 // KVListNamespaces returns all namespaces for a team

types.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
-	"samhofi.us/x/keybase/v2/types/chat1"
+	"samhofi.us/x/keybase/types/chat1"
-	"samhofi.us/x/keybase/v2/types/stellar1"
+	"samhofi.us/x/keybase/types/stellar1"
 )
 
 // RunOptions holds a set of options to be passed to Run
@@ -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,11 +1,11 @@
 // 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
 
 import (
-	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
+	gregor1 "samhofi.us/x/keybase/types/gregor1"
-	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
+	keybase1 "samhofi.us/x/keybase/types/keybase1"
 )
 
 type ConvIDStr string
@@ -139,119 +139,9 @@ func (o MsgFlipContent) DeepCopy() MsgFlipContent {
 	}
 }
 
-type EmojiContent struct {
-	Alias       string     `codec:"alias" json:"alias"`
-	IsCrossTeam bool       `codec:"isCrossTeam" json:"isCrossTeam"`
-	ConvID      *ConvIDStr `codec:"convID,omitempty" json:"convID,omitempty"`
-	MessageID   *MessageID `codec:"messageID,omitempty" json:"messageID,omitempty"`
-}
-
-func (o EmojiContent) DeepCopy() EmojiContent {
-	return EmojiContent{
-		Alias:       o.Alias,
-		IsCrossTeam: o.IsCrossTeam,
-		ConvID: (func(x *ConvIDStr) *ConvIDStr {
-			if x == nil {
-				return nil
-			}
-			tmp := (*x).DeepCopy()
-			return &tmp
-		})(o.ConvID),
-		MessageID: (func(x *MessageID) *MessageID {
-			if x == nil {
-				return nil
-			}
-			tmp := (*x).DeepCopy()
-			return &tmp
-		})(o.MessageID),
-	}
-}
-
-type MsgTextContent struct {
-	Body         string             `codec:"body" json:"body"`
-	Payments     []TextPayment      `codec:"payments" json:"payments"`
-	ReplyTo      *MessageID         `codec:"replyTo,omitempty" json:"replyTo,omitempty"`
-	ReplyToUID   *string            `codec:"replyToUID,omitempty" json:"replyToUID,omitempty"`
-	UserMentions []KnownUserMention `codec:"userMentions" json:"userMentions"`
-	TeamMentions []KnownTeamMention `codec:"teamMentions" json:"teamMentions"`
-	LiveLocation *LiveLocation      `codec:"liveLocation,omitempty" json:"liveLocation,omitempty"`
-	Emojis       []EmojiContent     `codec:"emojis" json:"emojis"`
-}
-
-func (o MsgTextContent) DeepCopy() MsgTextContent {
-	return MsgTextContent{
-		Body: o.Body,
-		Payments: (func(x []TextPayment) []TextPayment {
-			if x == nil {
-				return nil
-			}
-			ret := make([]TextPayment, len(x))
-			for i, v := range x {
-				vCopy := v.DeepCopy()
-				ret[i] = vCopy
-			}
-			return ret
-		})(o.Payments),
-		ReplyTo: (func(x *MessageID) *MessageID {
-			if x == nil {
-				return nil
-			}
-			tmp := (*x).DeepCopy()
-			return &tmp
-		})(o.ReplyTo),
-		ReplyToUID: (func(x *string) *string {
-			if x == nil {
-				return nil
-			}
-			tmp := (*x)
-			return &tmp
-		})(o.ReplyToUID),
-		UserMentions: (func(x []KnownUserMention) []KnownUserMention {
-			if x == nil {
-				return nil
-			}
-			ret := make([]KnownUserMention, len(x))
-			for i, v := range x {
-				vCopy := v.DeepCopy()
-				ret[i] = vCopy
-			}
-			return ret
-		})(o.UserMentions),
-		TeamMentions: (func(x []KnownTeamMention) []KnownTeamMention {
-			if x == nil {
-				return nil
-			}
-			ret := make([]KnownTeamMention, len(x))
-			for i, v := range x {
-				vCopy := v.DeepCopy()
-				ret[i] = vCopy
-			}
-			return ret
-		})(o.TeamMentions),
-		LiveLocation: (func(x *LiveLocation) *LiveLocation {
-			if x == nil {
-				return nil
-			}
-			tmp := (*x).DeepCopy()
-			return &tmp
-		})(o.LiveLocation),
-		Emojis: (func(x []EmojiContent) []EmojiContent {
-			if x == nil {
-				return nil
-			}
-			ret := make([]EmojiContent, len(x))
-			for i, v := range x {
-				vCopy := v.DeepCopy()
-				ret[i] = vCopy
-			}
-			return ret
-		})(o.Emojis),
-	}
-}
-
 type MsgContent struct {
 	TypeName           string                       `codec:"typeName" json:"type"`
-	Text               *MsgTextContent              `codec:"text,omitempty" json:"text,omitempty"`
+	Text               *MessageText                 `codec:"text,omitempty" json:"text,omitempty"`
 	Attachment         *MessageAttachment           `codec:"attachment,omitempty" json:"attachment,omitempty"`
 	Edit               *MessageEdit                 `codec:"edit,omitempty" json:"edit,omitempty"`
 	Reaction           *MessageReaction             `codec:"reaction,omitempty" json:"reaction,omitempty"`
@@ -269,7 +159,7 @@ type MsgContent struct {
 func (o MsgContent) DeepCopy() MsgContent {
 	return MsgContent{
 		TypeName: o.TypeName,
-		Text: (func(x *MsgTextContent) *MsgTextContent {
+		Text: (func(x *MessageText) *MessageText {
 			if x == nil {
 				return nil
 			}
@@ -379,7 +269,7 @@ type MsgSummary struct {
 	IsEphemeral         bool                     `codec:"isEphemeral,omitempty" json:"is_ephemeral,omitempty"`
 	IsEphemeralExpired  bool                     `codec:"isEphemeralExpired,omitempty" json:"is_ephemeral_expired,omitempty"`
 	ETime               gregor1.Time             `codec:"eTime,omitempty" json:"e_time,omitempty"`
-	Reactions           *UIReactionMap           `codec:"reactions,omitempty" json:"reactions,omitempty"`
+	Reactions           *ReactionMap             `codec:"reactions,omitempty" json:"reactions,omitempty"`
 	HasPairwiseMacs     bool                     `codec:"hasPairwiseMacs,omitempty" json:"has_pairwise_macs,omitempty"`
 	AtMentionUsernames  []string                 `codec:"atMentionUsernames,omitempty" json:"at_mention_usernames,omitempty"`
 	ChannelMention      string                   `codec:"channelMention,omitempty" json:"channel_mention,omitempty"`
@@ -414,7 +304,7 @@ func (o MsgSummary) DeepCopy() MsgSummary {
 		IsEphemeral:        o.IsEphemeral,
 		IsEphemeralExpired: o.IsEphemeralExpired,
 		ETime:              o.ETime.DeepCopy(),
-		Reactions: (func(x *UIReactionMap) *UIReactionMap {
+		Reactions: (func(x *ReactionMap) *ReactionMap {
 			if x == nil {
 				return nil
 			}
@@ -942,7 +832,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 +849,6 @@ func (o AdvertiseCommandAPIParam) DeepCopy() AdvertiseCommandAPIParam {
 			return ret
 		})(o.Commands),
 		TeamName: o.TeamName,
-		ConvID:   o.ConvID.DeepCopy(),
 	}
 }
 
@@ -1009,17 +897,17 @@ func (o GetResetConvMembersRes) DeepCopy() GetResetConvMembersRes {
 }
 
 type DeviceInfo struct {
-	DeviceID          keybase1.DeviceID     `codec:"deviceID" json:"id"`
+	DeviceID          keybase1.DeviceID `codec:"deviceID" json:"id"`
-	DeviceDescription string                `codec:"deviceDescription" json:"description"`
+	DeviceDescription string            `codec:"deviceDescription" json:"description"`
-	DeviceType        keybase1.DeviceTypeV2 `codec:"deviceType" json:"type"`
+	DeviceType        string            `codec:"deviceType" json:"type"`
-	DeviceCtime       int64                 `codec:"deviceCtime" json:"ctime"`
+	DeviceCtime       int64             `codec:"deviceCtime" json:"ctime"`
 }
 
 func (o DeviceInfo) DeepCopy() DeviceInfo {
 	return DeviceInfo{
 		DeviceID:          o.DeviceID.DeepCopy(),
 		DeviceDescription: o.DeviceDescription,
-		DeviceType:        o.DeviceType.DeepCopy(),
+		DeviceType:        o.DeviceType,
 		DeviceCtime:       o.DeviceCtime,
 	}
 }

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 (
+	gregor1 "samhofi.us/x/keybase/types/gregor1"
+	keybase1 "samhofi.us/x/keybase/types/keybase1"
+	stellar1 "samhofi.us/x/keybase/types/stellar1"
 	"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 UIPagination struct {
@@ -537,7 +536,6 @@ type InboxUIItem struct {
 	IsDefaultConv     bool                          `codec:"isDefaultConv" json:"isDefaultConv"`
 	Name              string                        `codec:"name" json:"name"`
 	Snippet           string                        `codec:"snippet" json:"snippet"`
-	SnippetDecorated  string                        `codec:"snippetDecorated" json:"snippetDecorated"`
 	SnippetDecoration SnippetDecoration             `codec:"snippetDecoration" json:"snippetDecoration"`
 	Channel           string                        `codec:"channel" json:"channel"`
 	Headline          string                        `codec:"headline" json:"headline"`
@@ -580,7 +578,6 @@ func (o InboxUIItem) DeepCopy() InboxUIItem {
 		IsDefaultConv:     o.IsDefaultConv,
 		Name:              o.Name,
 		Snippet:           o.Snippet,
-		SnippetDecorated:  o.SnippetDecorated,
 		SnippetDecoration: o.SnippetDecoration.DeepCopy(),
 		Channel:           o.Channel,
 		Headline:          o.Headline,
@@ -891,50 +888,6 @@ func (o UIMessageUnfurlInfo) DeepCopy() UIMessageUnfurlInfo {
 	}
 }
 
-type UIReactionDesc struct {
-	Decorated string              `codec:"decorated" json:"decorated"`
-	Users     map[string]Reaction `codec:"users" json:"users"`
-}
-
-func (o UIReactionDesc) DeepCopy() UIReactionDesc {
-	return UIReactionDesc{
-		Decorated: o.Decorated,
-		Users: (func(x map[string]Reaction) map[string]Reaction {
-			if x == nil {
-				return nil
-			}
-			ret := make(map[string]Reaction, len(x))
-			for k, v := range x {
-				kCopy := k
-				vCopy := v.DeepCopy()
-				ret[kCopy] = vCopy
-			}
-			return ret
-		})(o.Users),
-	}
-}
-
-type UIReactionMap struct {
-	Reactions map[string]UIReactionDesc `codec:"reactions" json:"reactions"`
-}
-
-func (o UIReactionMap) DeepCopy() UIReactionMap {
-	return UIReactionMap{
-		Reactions: (func(x map[string]UIReactionDesc) map[string]UIReactionDesc {
-			if x == nil {
-				return nil
-			}
-			ret := make(map[string]UIReactionDesc, len(x))
-			for k, v := range x {
-				kCopy := k
-				vCopy := v.DeepCopy()
-				ret[kCopy] = vCopy
-			}
-			return ret
-		})(o.Reactions),
-	}
-}
-
 type UIMessageValid struct {
 	MessageID             MessageID              `codec:"messageID" json:"messageID"`
 	Ctime                 gregor1.Time           `codec:"ctime" json:"ctime"`
@@ -944,7 +897,7 @@ type UIMessageValid struct {
 	BodySummary           string                 `codec:"bodySummary" json:"bodySummary"`
 	SenderUsername        string                 `codec:"senderUsername" json:"senderUsername"`
 	SenderDeviceName      string                 `codec:"senderDeviceName" json:"senderDeviceName"`
-	SenderDeviceType      keybase1.DeviceTypeV2  `codec:"senderDeviceType" json:"senderDeviceType"`
+	SenderDeviceType      string                 `codec:"senderDeviceType" json:"senderDeviceType"`
 	SenderUID             gregor1.UID            `codec:"senderUID" json:"senderUID"`
 	SenderDeviceID        gregor1.DeviceID       `codec:"senderDeviceID" json:"senderDeviceID"`
 	Superseded            bool                   `codec:"superseded" json:"superseded"`
@@ -957,7 +910,7 @@ type UIMessageValid struct {
 	IsEphemeralExpired    bool                   `codec:"isEphemeralExpired" json:"isEphemeralExpired"`
 	ExplodedBy            *string                `codec:"explodedBy,omitempty" json:"explodedBy,omitempty"`
 	Etime                 gregor1.Time           `codec:"etime" json:"etime"`
-	Reactions             UIReactionMap          `codec:"reactions" json:"reactions"`
+	Reactions             ReactionMap            `codec:"reactions" json:"reactions"`
 	HasPairwiseMacs       bool                   `codec:"hasPairwiseMacs" json:"hasPairwiseMacs"`
 	PaymentInfos          []UIPaymentInfo        `codec:"paymentInfos" json:"paymentInfos"`
 	RequestInfo           *UIRequestInfo         `codec:"requestInfo,omitempty" json:"requestInfo,omitempty"`
@@ -993,7 +946,7 @@ func (o UIMessageValid) DeepCopy() UIMessageValid {
 		BodySummary:      o.BodySummary,
 		SenderUsername:   o.SenderUsername,
 		SenderDeviceName: o.SenderDeviceName,
-		SenderDeviceType: o.SenderDeviceType.DeepCopy(),
+		SenderDeviceType: o.SenderDeviceType,
 		SenderUID:        o.SenderUID.DeepCopy(),
 		SenderDeviceID:   o.SenderDeviceID.DeepCopy(),
 		Superseded:       o.Superseded,
@@ -1114,7 +1067,6 @@ type UIMessageOutbox struct {
 	IsEphemeral       bool            `codec:"isEphemeral" json:"isEphemeral"`
 	FlipGameID        *FlipGameIDStr  `codec:"flipGameID,omitempty" json:"flipGameID,omitempty"`
 	ReplyTo           *UIMessage      `codec:"replyTo,omitempty" json:"replyTo,omitempty"`
-	Supersedes        MessageID       `codec:"supersedes" json:"supersedes"`
 	Filename          string          `codec:"filename" json:"filename"`
 	Title             string          `codec:"title" json:"title"`
 	Preview           *MakePreviewRes `codec:"preview,omitempty" json:"preview,omitempty"`
@@ -1150,9 +1102,8 @@ func (o UIMessageOutbox) DeepCopy() UIMessageOutbox {
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.ReplyTo),
-		Supersedes: o.Supersedes.DeepCopy(),
+		Filename: o.Filename,
-		Filename:   o.Filename,
+		Title:    o.Title,
-		Title:      o.Title,
 		Preview: (func(x *MakePreviewRes) *MakePreviewRes {
 			if x == nil {
 				return nil
@@ -1466,7 +1417,6 @@ const (
 	UITextDecorationTyp_LINK               UITextDecorationTyp = 4
 	UITextDecorationTyp_MAILTO             UITextDecorationTyp = 5
 	UITextDecorationTyp_KBFSPATH           UITextDecorationTyp = 6
-	UITextDecorationTyp_EMOJI              UITextDecorationTyp = 7
 )
 
 func (o UITextDecorationTyp) DeepCopy() UITextDecorationTyp { return o }
@@ -1479,7 +1429,6 @@ var UITextDecorationTypMap = map[string]UITextDecorationTyp{
 	"LINK":               4,
 	"MAILTO":             5,
 	"KBFSPATH":           6,
-	"EMOJI":              7,
 }
 
 var UITextDecorationTypRevMap = map[UITextDecorationTyp]string{
@@ -1490,7 +1439,6 @@ var UITextDecorationTypRevMap = map[UITextDecorationTyp]string{
 	4: "LINK",
 	5: "MAILTO",
 	6: "KBFSPATH",
-	7: "EMOJI",
 }
 
 func (e UITextDecorationTyp) String() string {
@@ -1617,7 +1565,6 @@ type UITextDecoration struct {
 	Link__               *UILinkDecoration     `codec:"link,omitempty" json:"link,omitempty"`
 	Mailto__             *UILinkDecoration     `codec:"mailto,omitempty" json:"mailto,omitempty"`
 	Kbfspath__           *KBFSPath             `codec:"kbfspath,omitempty" json:"kbfspath,omitempty"`
-	Emoji__              *Emoji                `codec:"emoji,omitempty" json:"emoji,omitempty"`
 }
 
 func (o *UITextDecoration) Typ() (ret UITextDecorationTyp, err error) {
@@ -1657,11 +1604,6 @@ func (o *UITextDecoration) Typ() (ret UITextDecorationTyp, err error) {
 			err = errors.New("unexpected nil value for Kbfspath__")
 			return ret, err
 		}
-	case UITextDecorationTyp_EMOJI:
-		if o.Emoji__ == nil {
-			err = errors.New("unexpected nil value for Emoji__")
-			return ret, err
-		}
 	}
 	return o.Typ__, nil
 }
@@ -1736,16 +1678,6 @@ func (o UITextDecoration) Kbfspath() (res KBFSPath) {
 	return *o.Kbfspath__
 }
 
-func (o UITextDecoration) Emoji() (res Emoji) {
-	if o.Typ__ != UITextDecorationTyp_EMOJI {
-		panic("wrong case accessed")
-	}
-	if o.Emoji__ == nil {
-		return
-	}
-	return *o.Emoji__
-}
-
 func NewUITextDecorationWithPayment(v TextPayment) UITextDecoration {
 	return UITextDecoration{
 		Typ__:     UITextDecorationTyp_PAYMENT,
@@ -1795,13 +1727,6 @@ func NewUITextDecorationWithKbfspath(v KBFSPath) UITextDecoration {
 	}
 }
 
-func NewUITextDecorationWithEmoji(v Emoji) UITextDecoration {
-	return UITextDecoration{
-		Typ__:   UITextDecorationTyp_EMOJI,
-		Emoji__: &v,
-	}
-}
-
 func (o UITextDecoration) DeepCopy() UITextDecoration {
 	return UITextDecoration{
 		Typ__: o.Typ__.DeepCopy(),
@@ -1854,13 +1779,6 @@ func (o UITextDecoration) DeepCopy() UITextDecoration {
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.Kbfspath__),
-		Emoji__: (func(x *Emoji) *Emoji {
-			if x == nil {
-				return nil
-			}
-			tmp := (*x).DeepCopy()
-			return &tmp
-		})(o.Emoji__),
 	}
 }
 
@@ -1999,8 +1917,7 @@ func (o UIChatSearchConvHits) DeepCopy() UIChatSearchConvHits {
 }
 
 type UIChatSearchTeamHits struct {
-	Hits             []keybase1.TeamSearchItem `codec:"hits" json:"hits"`
+	Hits []keybase1.TeamSearchItem `codec:"hits" json:"hits"`
-	SuggestedMatches bool                      `codec:"suggestedMatches" json:"suggestedMatches"`
 }
 
 func (o UIChatSearchTeamHits) DeepCopy() UIChatSearchTeamHits {
@@ -2016,29 +1933,6 @@ func (o UIChatSearchTeamHits) DeepCopy() UIChatSearchTeamHits {
 			}
 			return ret
 		})(o.Hits),
-		SuggestedMatches: o.SuggestedMatches,
-	}
-}
-
-type UIChatSearchBotHits struct {
-	Hits             []keybase1.FeaturedBot `codec:"hits" json:"hits"`
-	SuggestedMatches bool                   `codec:"suggestedMatches" json:"suggestedMatches"`
-}
-
-func (o UIChatSearchBotHits) DeepCopy() UIChatSearchBotHits {
-	return UIChatSearchBotHits{
-		Hits: (func(x []keybase1.FeaturedBot) []keybase1.FeaturedBot {
-			if x == nil {
-				return nil
-			}
-			ret := make([]keybase1.FeaturedBot, len(x))
-			for i, v := range x {
-				vCopy := v.DeepCopy()
-				ret[i] = vCopy
-			}
-			return ret
-		})(o.Hits),
-		SuggestedMatches: o.SuggestedMatches,
 	}
 }
 

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 (
+	gregor1 "samhofi.us/x/keybase/types/gregor1"
+	keybase1 "samhofi.us/x/keybase/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
@@ -312,8 +310,6 @@ const (
 	TopicType_CHAT         TopicType = 1
 	TopicType_DEV          TopicType = 2
 	TopicType_KBFSFILEEDIT TopicType = 3
-	TopicType_EMOJI        TopicType = 4
-	TopicType_EMOJICROSS   TopicType = 5
 )
 
 func (o TopicType) DeepCopy() TopicType { return o }
@@ -323,8 +319,6 @@ var TopicTypeMap = map[string]TopicType{
 	"CHAT":         1,
 	"DEV":          2,
 	"KBFSFILEEDIT": 3,
-	"EMOJI":        4,
-	"EMOJICROSS":   5,
 }
 
 var TopicTypeRevMap = map[TopicType]string{
@@ -332,8 +326,6 @@ var TopicTypeRevMap = map[TopicType]string{
 	1: "CHAT",
 	2: "DEV",
 	3: "KBFSFILEEDIT",
-	4: "EMOJI",
-	5: "EMOJICROSS",
 }
 
 type TeamType int
@@ -634,32 +626,6 @@ func (o RateLimit) DeepCopy() RateLimit {
 	}
 }
 
-type InboxParticipantsMode int
-
-const (
-	InboxParticipantsMode_ALL        InboxParticipantsMode = 0
-	InboxParticipantsMode_SKIP_TEAMS InboxParticipantsMode = 1
-)
-
-func (o InboxParticipantsMode) DeepCopy() InboxParticipantsMode { return o }
-
-var InboxParticipantsModeMap = map[string]InboxParticipantsMode{
-	"ALL":        0,
-	"SKIP_TEAMS": 1,
-}
-
-var InboxParticipantsModeRevMap = map[InboxParticipantsMode]string{
-	0: "ALL",
-	1: "SKIP_TEAMS",
-}
-
-func (e InboxParticipantsMode) String() string {
-	if v, ok := InboxParticipantsModeRevMap[e]; ok {
-		return v
-	}
-	return fmt.Sprintf("%v", int(e))
-}
-
 type GetInboxQuery struct {
 	ConvID            *ConversationID            `codec:"convID,omitempty" json:"convID,omitempty"`
 	TopicType         *TopicType                 `codec:"topicType,omitempty" json:"topicType,omitempty"`
@@ -678,7 +644,6 @@ type GetInboxQuery struct {
 	ReadOnly          bool                       `codec:"readOnly" json:"readOnly"`
 	ComputeActiveList bool                       `codec:"computeActiveList" json:"computeActiveList"`
 	SummarizeMaxMsgs  bool                       `codec:"summarizeMaxMsgs" json:"summarizeMaxMsgs"`
-	ParticipantsMode  InboxParticipantsMode      `codec:"participantsMode" json:"participantsMode"`
 	SkipBgLoads       bool                       `codec:"skipBgLoads" json:"skipBgLoads"`
 	AllowUnseenQuery  bool                       `codec:"allowUnseenQuery" json:"allowUnseenQuery"`
 }
@@ -800,7 +765,6 @@ func (o GetInboxQuery) DeepCopy() GetInboxQuery {
 		ReadOnly:          o.ReadOnly,
 		ComputeActiveList: o.ComputeActiveList,
 		SummarizeMaxMsgs:  o.SummarizeMaxMsgs,
-		ParticipantsMode:  o.ParticipantsMode.DeepCopy(),
 		SkipBgLoads:       o.SkipBgLoads,
 		AllowUnseenQuery:  o.AllowUnseenQuery,
 	}
@@ -994,7 +958,6 @@ type ConversationReaderInfo struct {
 	MaxMsgid          MessageID                    `codec:"maxMsgid" json:"maxMsgid"`
 	Status            ConversationMemberStatus     `codec:"status" json:"status"`
 	UntrustedTeamRole keybase1.TeamRole            `codec:"untrustedTeamRole" json:"untrustedTeamRole"`
-	LastSendTime      gregor1.Time                 `codec:"l" json:"l"`
 	Journeycard       *ConversationJourneycardInfo `codec:"jc,omitempty" json:"jc,omitempty"`
 }
 
@@ -1005,7 +968,6 @@ func (o ConversationReaderInfo) DeepCopy() ConversationReaderInfo {
 		MaxMsgid:          o.MaxMsgid.DeepCopy(),
 		Status:            o.Status.DeepCopy(),
 		UntrustedTeamRole: o.UntrustedTeamRole.DeepCopy(),
-		LastSendTime:      o.LastSendTime.DeepCopy(),
 		Journeycard: (func(x *ConversationJourneycardInfo) *ConversationJourneycardInfo {
 			if x == nil {
 				return nil
@@ -1370,7 +1332,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 +1431,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),
 	}
 }
 
@@ -2004,7 +1958,6 @@ const (
 	GetThreadReason_KBFSFILEACTIVITY   GetThreadReason = 8
 	GetThreadReason_COINFLIP           GetThreadReason = 9
 	GetThreadReason_BOTCOMMANDS        GetThreadReason = 10
-	GetThreadReason_EMOJISOURCE        GetThreadReason = 11
 )
 
 func (o GetThreadReason) DeepCopy() GetThreadReason { return o }
@@ -2021,7 +1974,6 @@ var GetThreadReasonMap = map[string]GetThreadReason{
 	"KBFSFILEACTIVITY":   8,
 	"COINFLIP":           9,
 	"BOTCOMMANDS":        10,
-	"EMOJISOURCE":        11,
 }
 
 var GetThreadReasonRevMap = map[GetThreadReason]string{
@@ -2036,7 +1988,6 @@ var GetThreadReasonRevMap = map[GetThreadReason]string{
 	8:  "KBFSFILEACTIVITY",
 	9:  "COINFLIP",
 	10: "BOTCOMMANDS",
-	11: "EMOJISOURCE",
 }
 
 func (e GetThreadReason) String() string {
@@ -2093,8 +2044,6 @@ type SearchOpts struct {
 	ConvID            *ConversationID `codec:"convID,omitempty" json:"convID,omitempty"`
 	MaxNameConvs      int             `codec:"maxNameConvs" json:"maxNameConvs"`
 	MaxTeams          int             `codec:"maxTeams" json:"maxTeams"`
-	MaxBots           int             `codec:"maxBots" json:"maxBots"`
-	SkipBotCache      bool            `codec:"skipBotCache" json:"skipBotCache"`
 }
 
 func (o SearchOpts) DeepCopy() SearchOpts {
@@ -2128,8 +2077,6 @@ func (o SearchOpts) DeepCopy() SearchOpts {
 		})(o.ConvID),
 		MaxNameConvs: o.MaxNameConvs,
 		MaxTeams:     o.MaxTeams,
-		MaxBots:      o.MaxBots,
-		SkipBotCache: o.SkipBotCache,
 	}
 }
 
@@ -2441,7 +2388,6 @@ type Asset struct {
 	Size      int64         `codec:"size" json:"size"`
 	MimeType  string        `codec:"mimeType" json:"mimeType"`
 	EncHash   Hash          `codec:"encHash" json:"encHash"`
-	PtHash    Hash          `codec:"ptHash" json:"ptHash"`
 	Key       []byte        `codec:"key" json:"key"`
 	VerifyKey []byte        `codec:"verifyKey" json:"verifyKey"`
 	Title     string        `codec:"title" json:"title"`
@@ -2460,7 +2406,6 @@ func (o Asset) DeepCopy() Asset {
 		Size:     o.Size,
 		MimeType: o.MimeType,
 		EncHash:  o.EncHash.DeepCopy(),
-		PtHash:   o.PtHash.DeepCopy(),
 		Key: (func(x []byte) []byte {
 			if x == nil {
 				return nil
@@ -2491,7 +2436,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 +2444,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 {
@@ -2530,126 +2472,3 @@ func (o TeamMember) DeepCopy() TeamMember {
 		Status: o.Status.DeepCopy(),
 	}
 }
-
-type LastActiveStatus int
-
-const (
-	LastActiveStatus_NONE            LastActiveStatus = 0
-	LastActiveStatus_ACTIVE          LastActiveStatus = 1
-	LastActiveStatus_RECENTLY_ACTIVE LastActiveStatus = 2
-)
-
-func (o LastActiveStatus) DeepCopy() LastActiveStatus { return o }
-
-var LastActiveStatusMap = map[string]LastActiveStatus{
-	"NONE":            0,
-	"ACTIVE":          1,
-	"RECENTLY_ACTIVE": 2,
-}
-
-var LastActiveStatusRevMap = map[LastActiveStatus]string{
-	0: "NONE",
-	1: "ACTIVE",
-	2: "RECENTLY_ACTIVE",
-}
-
-func (e LastActiveStatus) String() string {
-	if v, ok := LastActiveStatusRevMap[e]; ok {
-		return v
-	}
-	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/gregor.go

@@ -1,11 +1,11 @@
 // 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
 
 import (
-	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
+	gregor1 "samhofi.us/x/keybase/types/gregor1"
-	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
+	keybase1 "samhofi.us/x/keybase/types/keybase1"
 )
 
 type GenericPayload struct {
@@ -453,6 +453,16 @@ func (o UpdateConversations) DeepCopy() UpdateConversations {
 	}
 }
 
+type TeamChannelUpdate struct {
+	TeamID TLFID `codec:"teamID" json:"teamID"`
+}
+
+func (o TeamChannelUpdate) DeepCopy() TeamChannelUpdate {
+	return TeamChannelUpdate{
+		TeamID: o.TeamID.DeepCopy(),
+	}
+}
+
 type SetConvRetentionUpdate struct {
 	InboxVers InboxVers       `codec:"inboxVers" json:"inboxVers"`
 	ConvID    ConversationID  `codec:"convID" json:"convID"`

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/types/keybase1"
 	"errors"
 	"fmt"
-
-	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 )
 
 type ChatActivitySource int
@@ -324,8 +323,8 @@ func (o EphemeralPurgeNotifInfo) DeepCopy() EphemeralPurgeNotifInfo {
 }
 
 type ReactionUpdate struct {
-	Reactions   UIReactionMap `codec:"reactions" json:"reactions"`
+	Reactions   ReactionMap `codec:"reactions" json:"reactions"`
-	TargetMsgID MessageID     `codec:"targetMsgID" json:"targetMsgID"`
+	TargetMsgID MessageID   `codec:"targetMsgID" json:"targetMsgID"`
 }
 
 func (o ReactionUpdate) DeepCopy() ReactionUpdate {
@@ -758,16 +757,20 @@ func (o ChatActivity) DeepCopy() ChatActivity {
 }
 
 type TyperInfo struct {
-	Uid      keybase1.UID      `codec:"uid" json:"uid"`
+	Uid        keybase1.UID      `codec:"uid" json:"uid"`
-	Username string            `codec:"username" json:"username"`
+	Username   string            `codec:"username" json:"username"`
-	DeviceID keybase1.DeviceID `codec:"deviceID" json:"deviceID"`
+	DeviceID   keybase1.DeviceID `codec:"deviceID" json:"deviceID"`
+	DeviceName string            `codec:"deviceName" json:"deviceName"`
+	DeviceType string            `codec:"deviceType" json:"deviceType"`
 }
 
 func (o TyperInfo) DeepCopy() TyperInfo {
 	return TyperInfo{
-		Uid:      o.Uid.DeepCopy(),
+		Uid:        o.Uid.DeepCopy(),
-		Username: o.Username,
+		Username:   o.Username,
-		DeviceID: o.DeviceID.DeepCopy(),
+		DeviceID:   o.DeviceID.DeepCopy(),
+		DeviceName: o.DeviceName,
+		DeviceType: o.DeviceType,
 	}
 }
 

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 (
+	gregor1 "samhofi.us/x/keybase/types/gregor1"
+	keybase1 "samhofi.us/x/keybase/types/keybase1"
 	"errors"
 	"fmt"
-
-	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
-	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 )
 
 type MessageBoxed struct {
@@ -232,10 +231,8 @@ func (o NewConversationRemoteRes) DeepCopy() NewConversationRemoteRes {
 }
 
 type GetMessagesRemoteRes struct {
-	Msgs        []MessageBoxed          `codec:"msgs" json:"msgs"`
+	Msgs      []MessageBoxed `codec:"msgs" json:"msgs"`
-	MembersType ConversationMembersType `codec:"membersType" json:"membersType"`
+	RateLimit *RateLimit     `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
-	Visibility  keybase1.TLFVisibility  `codec:"visibility" json:"visibility"`
-	RateLimit   *RateLimit              `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
 }
 
 func (o GetMessagesRemoteRes) DeepCopy() GetMessagesRemoteRes {
@@ -251,8 +248,6 @@ func (o GetMessagesRemoteRes) DeepCopy() GetMessagesRemoteRes {
 			}
 			return ret
 		})(o.Msgs),
-		MembersType: o.MembersType.DeepCopy(),
-		Visibility:  o.Visibility.DeepCopy(),
 		RateLimit: (func(x *RateLimit) *RateLimit {
 			if x == nil {
 				return nil
@@ -966,24 +961,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 +985,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 +1019,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 +1040,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 +1064,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__),
 	}
 }
 
@@ -1294,155 +1247,3 @@ func (o BotInfoHash) DeepCopy() BotInfoHash {
 		return append([]byte{}, x...)
 	})(o)
 }
-
-type GetDefaultTeamChannelsRes struct {
-	Convs     []ConversationID `codec:"convs" json:"convs"`
-	RateLimit *RateLimit       `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
-}
-
-func (o GetDefaultTeamChannelsRes) DeepCopy() GetDefaultTeamChannelsRes {
-	return GetDefaultTeamChannelsRes{
-		Convs: (func(x []ConversationID) []ConversationID {
-			if x == nil {
-				return nil
-			}
-			ret := make([]ConversationID, len(x))
-			for i, v := range x {
-				vCopy := v.DeepCopy()
-				ret[i] = vCopy
-			}
-			return ret
-		})(o.Convs),
-		RateLimit: (func(x *RateLimit) *RateLimit {
-			if x == nil {
-				return nil
-			}
-			tmp := (*x).DeepCopy()
-			return &tmp
-		})(o.RateLimit),
-	}
-}
-
-type SetDefaultTeamChannelsRes struct {
-	RateLimit *RateLimit `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
-}
-
-func (o SetDefaultTeamChannelsRes) DeepCopy() SetDefaultTeamChannelsRes {
-	return SetDefaultTeamChannelsRes{
-		RateLimit: (func(x *RateLimit) *RateLimit {
-			if x == nil {
-				return nil
-			}
-			tmp := (*x).DeepCopy()
-			return &tmp
-		})(o.RateLimit),
-	}
-}
-
-type GetRecentJoinsRes struct {
-	NumJoins  int        `codec:"numJoins" json:"numJoins"`
-	RateLimit *RateLimit `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
-}
-
-func (o GetRecentJoinsRes) DeepCopy() GetRecentJoinsRes {
-	return GetRecentJoinsRes{
-		NumJoins: o.NumJoins,
-		RateLimit: (func(x *RateLimit) *RateLimit {
-			if x == nil {
-				return nil
-			}
-			tmp := (*x).DeepCopy()
-			return &tmp
-		})(o.RateLimit),
-	}
-}
-
-type RefreshParticipantsRemoteRes struct {
-	HashMatch bool          `codec:"hashMatch" json:"hashMatch"`
-	Uids      []gregor1.UID `codec:"uids" json:"uids"`
-	Hash      string        `codec:"hash" json:"hash"`
-	RateLimit *RateLimit    `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
-}
-
-func (o RefreshParticipantsRemoteRes) DeepCopy() RefreshParticipantsRemoteRes {
-	return RefreshParticipantsRemoteRes{
-		HashMatch: o.HashMatch,
-		Uids: (func(x []gregor1.UID) []gregor1.UID {
-			if x == nil {
-				return nil
-			}
-			ret := make([]gregor1.UID, len(x))
-			for i, v := range x {
-				vCopy := v.DeepCopy()
-				ret[i] = vCopy
-			}
-			return ret
-		})(o.Uids),
-		Hash: o.Hash,
-		RateLimit: (func(x *RateLimit) *RateLimit {
-			if x == nil {
-				return nil
-			}
-			tmp := (*x).DeepCopy()
-			return &tmp
-		})(o.RateLimit),
-	}
-}
-
-type GetLastActiveAtRes struct {
-	LastActiveAt gregor1.Time `codec:"lastActiveAt" json:"lastActiveAt"`
-	RateLimit    *RateLimit   `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
-}
-
-func (o GetLastActiveAtRes) DeepCopy() GetLastActiveAtRes {
-	return GetLastActiveAtRes{
-		LastActiveAt: o.LastActiveAt.DeepCopy(),
-		RateLimit: (func(x *RateLimit) *RateLimit {
-			if x == nil {
-				return nil
-			}
-			tmp := (*x).DeepCopy()
-			return &tmp
-		})(o.RateLimit),
-	}
-}
-
-type ResetConversationMember struct {
-	ConvID ConversationID `codec:"convID" json:"convID"`
-	Uid    gregor1.UID    `codec:"uid" json:"uid"`
-}
-
-func (o ResetConversationMember) DeepCopy() ResetConversationMember {
-	return ResetConversationMember{
-		ConvID: o.ConvID.DeepCopy(),
-		Uid:    o.Uid.DeepCopy(),
-	}
-}
-
-type GetResetConversationsRes struct {
-	ResetConvs []ResetConversationMember `codec:"resetConvs" json:"resetConvs"`
-	RateLimit  *RateLimit                `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
-}
-
-func (o GetResetConversationsRes) DeepCopy() GetResetConversationsRes {
-	return GetResetConversationsRes{
-		ResetConvs: (func(x []ResetConversationMember) []ResetConversationMember {
-			if x == nil {
-				return nil
-			}
-			ret := make([]ResetConversationMember, len(x))
-			for i, v := range x {
-				vCopy := v.DeepCopy()
-				ret[i] = vCopy
-			}
-			return ret
-		})(o.ResetConvs),
-		RateLimit: (func(x *RateLimit) *RateLimit {
-			if x == nil {
-				return nil
-			}
-			tmp := (*x).DeepCopy()
-			return &tmp
-		})(o.RateLimit),
-	}
-}

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/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
 
@@ -57,38 +57,6 @@ func (o GetBlockRes) DeepCopy() GetBlockRes {
 	}
 }
 
-type GetBlockSizesRes struct {
-	Sizes    []int         `codec:"sizes" json:"sizes"`
-	Statuses []BlockStatus `codec:"statuses" json:"statuses"`
-}
-
-func (o GetBlockSizesRes) DeepCopy() GetBlockSizesRes {
-	return GetBlockSizesRes{
-		Sizes: (func(x []int) []int {
-			if x == nil {
-				return nil
-			}
-			ret := make([]int, len(x))
-			for i, v := range x {
-				vCopy := v
-				ret[i] = vCopy
-			}
-			return ret
-		})(o.Sizes),
-		Statuses: (func(x []BlockStatus) []BlockStatus {
-			if x == nil {
-				return nil
-			}
-			ret := make([]BlockStatus, len(x))
-			for i, v := range x {
-				vCopy := v.DeepCopy()
-				ret[i] = vCopy
-			}
-			return ret
-		})(o.Statuses),
-	}
-}
-
 type BlockRefNonce [8]byte
 
 func (o BlockRefNonce) DeepCopy() BlockRefNonce {
@@ -183,75 +151,3 @@ type BlockPingResponse struct {
 func (o BlockPingResponse) DeepCopy() BlockPingResponse {
 	return BlockPingResponse{}
 }
-
-type UsageStatRecord struct {
-	Write      int64 `codec:"write" json:"write"`
-	Archive    int64 `codec:"archive" json:"archive"`
-	Read       int64 `codec:"read" json:"read"`
-	MdWrite    int64 `codec:"mdWrite" json:"mdWrite"`
-	GitWrite   int64 `codec:"gitWrite" json:"gitWrite"`
-	GitArchive int64 `codec:"gitArchive" json:"gitArchive"`
-}
-
-func (o UsageStatRecord) DeepCopy() UsageStatRecord {
-	return UsageStatRecord{
-		Write:      o.Write,
-		Archive:    o.Archive,
-		Read:       o.Read,
-		MdWrite:    o.MdWrite,
-		GitWrite:   o.GitWrite,
-		GitArchive: o.GitArchive,
-	}
-}
-
-type UsageStat struct {
-	Bytes  UsageStatRecord `codec:"bytes" json:"bytes"`
-	Blocks UsageStatRecord `codec:"blocks" json:"blocks"`
-	Mtime  Time            `codec:"mtime" json:"mtime"`
-}
-
-func (o UsageStat) DeepCopy() UsageStat {
-	return UsageStat{
-		Bytes:  o.Bytes.DeepCopy(),
-		Blocks: o.Blocks.DeepCopy(),
-		Mtime:  o.Mtime.DeepCopy(),
-	}
-}
-
-type FolderUsageStat struct {
-	FolderID string    `codec:"folderID" json:"folderID"`
-	Stats    UsageStat `codec:"stats" json:"stats"`
-}
-
-func (o FolderUsageStat) DeepCopy() FolderUsageStat {
-	return FolderUsageStat{
-		FolderID: o.FolderID,
-		Stats:    o.Stats.DeepCopy(),
-	}
-}
-
-type BlockQuotaInfo struct {
-	Folders  []FolderUsageStat `codec:"folders" json:"folders"`
-	Total    UsageStat         `codec:"total" json:"total"`
-	Limit    int64             `codec:"limit" json:"limit"`
-	GitLimit int64             `codec:"gitLimit" json:"gitLimit"`
-}
-
-func (o BlockQuotaInfo) DeepCopy() BlockQuotaInfo {
-	return BlockQuotaInfo{
-		Folders: (func(x []FolderUsageStat) []FolderUsageStat {
-			if x == nil {
-				return nil
-			}
-			ret := make([]FolderUsageStat, len(x))
-			for i, v := range x {
-				vCopy := v.DeepCopy()
-				ret[i] = vCopy
-			}
-			return ret
-		})(o.Folders),
-		Total:    o.Total.DeepCopy(),
-		Limit:    o.Limit,
-		GitLimit: o.GitLimit,
-	}
-}

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
 
@@ -26,12 +26,6 @@ func (o DurationSec) DeepCopy() DurationSec {
 	return o
 }
 
-type DurationMsec float64
-
-func (o DurationMsec) DeepCopy() DurationMsec {
-	return o
-}
-
 type StringKVPair struct {
 	Key   string `codec:"key" json:"key"`
 	Value string `codec:"value" json:"value"`
@@ -438,7 +432,7 @@ type PublicKey struct {
 	ParentID          string        `codec:"parentID" json:"parentID"`
 	DeviceID          DeviceID      `codec:"deviceID" json:"deviceID"`
 	DeviceDescription string        `codec:"deviceDescription" json:"deviceDescription"`
-	DeviceType        DeviceTypeV2  `codec:"deviceType" json:"deviceType"`
+	DeviceType        string        `codec:"deviceType" json:"deviceType"`
 	CTime             Time          `codec:"cTime" json:"cTime"`
 	ETime             Time          `codec:"eTime" json:"eTime"`
 	IsRevoked         bool          `codec:"isRevoked" json:"isRevoked"`
@@ -464,7 +458,7 @@ func (o PublicKey) DeepCopy() PublicKey {
 		ParentID:          o.ParentID,
 		DeviceID:          o.DeviceID.DeepCopy(),
 		DeviceDescription: o.DeviceDescription,
-		DeviceType:        o.DeviceType.DeepCopy(),
+		DeviceType:        o.DeviceType,
 		CTime:             o.CTime.DeepCopy(),
 		ETime:             o.ETime.DeepCopy(),
 		IsRevoked:         o.IsRevoked,
@@ -510,21 +504,21 @@ func (o User) DeepCopy() User {
 }
 
 type Device struct {
-	Type               DeviceTypeV2 `codec:"type" json:"type"`
+	Type               string   `codec:"type" json:"type"`
-	Name               string       `codec:"name" json:"name"`
+	Name               string   `codec:"name" json:"name"`
-	DeviceID           DeviceID     `codec:"deviceID" json:"deviceID"`
+	DeviceID           DeviceID `codec:"deviceID" json:"deviceID"`
-	DeviceNumberOfType int          `codec:"deviceNumberOfType" json:"deviceNumberOfType"`
+	DeviceNumberOfType int      `codec:"deviceNumberOfType" json:"deviceNumberOfType"`
-	CTime              Time         `codec:"cTime" json:"cTime"`
+	CTime              Time     `codec:"cTime" json:"cTime"`
-	MTime              Time         `codec:"mTime" json:"mTime"`
+	MTime              Time     `codec:"mTime" json:"mTime"`
-	LastUsedTime       Time         `codec:"lastUsedTime" json:"lastUsedTime"`
+	LastUsedTime       Time     `codec:"lastUsedTime" json:"lastUsedTime"`
-	EncryptKey         KID          `codec:"encryptKey" json:"encryptKey"`
+	EncryptKey         KID      `codec:"encryptKey" json:"encryptKey"`
-	VerifyKey          KID          `codec:"verifyKey" json:"verifyKey"`
+	VerifyKey          KID      `codec:"verifyKey" json:"verifyKey"`
-	Status             int          `codec:"status" json:"status"`
+	Status             int      `codec:"status" json:"status"`
 }
 
 func (o Device) DeepCopy() Device {
 	return Device{
-		Type:               o.Type.DeepCopy(),
+		Type:               o.Type,
 		Name:               o.Name,
 		DeviceID:           o.DeviceID.DeepCopy(),
 		DeviceNumberOfType: o.DeviceNumberOfType,
@@ -563,12 +557,6 @@ func (e DeviceType) String() string {
 	return fmt.Sprintf("%v", int(e))
 }
 
-type DeviceTypeV2 string
-
-func (o DeviceTypeV2) DeepCopy() DeviceTypeV2 {
-	return o
-}
-
 type Stream struct {
 	Fd int `codec:"fd" json:"fd"`
 }
@@ -1073,84 +1061,26 @@ func (e OfflineAvailability) String() string {
 	return fmt.Sprintf("%v", int(e))
 }
 
-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 {
-	return UserReacji{
-		Name: o.Name,
-		CustomAddr: (func(x *string) *string {
-			if x == nil {
-				return nil
-			}
-			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 {
-	TopReacjis []UserReacji   `codec:"topReacjis" json:"topReacjis"`
+	TopReacjis []string       `codec:"topReacjis" json:"topReacjis"`
 	SkinTone   ReacjiSkinTone `codec:"skinTone" json:"skinTone"`
 }
 
 func (o UserReacjis) DeepCopy() UserReacjis {
 	return UserReacjis{
-		TopReacjis: (func(x []UserReacji) []UserReacji {
+		TopReacjis: (func(x []string) []string {
 			if x == nil {
 				return nil
 			}
-			ret := make([]UserReacji, len(x))
+			ret := make([]string, len(x))
 			for i, v := range x {
-				vCopy := v.DeepCopy()
+				vCopy := v
 				ret[i] = vCopy
 			}
 			return ret
@@ -1158,38 +1088,3 @@ func (o UserReacjis) DeepCopy() UserReacjis {
 		SkinTone: o.SkinTone.DeepCopy(),
 	}
 }
-
-type WotStatusType int
-
-const (
-	WotStatusType_NONE     WotStatusType = 0
-	WotStatusType_PROPOSED WotStatusType = 1
-	WotStatusType_ACCEPTED WotStatusType = 2
-	WotStatusType_REJECTED WotStatusType = 3
-	WotStatusType_REVOKED  WotStatusType = 4
-)
-
-func (o WotStatusType) DeepCopy() WotStatusType { return o }
-
-var WotStatusTypeMap = map[string]WotStatusType{
-	"NONE":     0,
-	"PROPOSED": 1,
-	"ACCEPTED": 2,
-	"REJECTED": 3,
-	"REVOKED":  4,
-}
-
-var WotStatusTypeRevMap = map[WotStatusType]string{
-	0: "NONE",
-	1: "PROPOSED",
-	2: "ACCEPTED",
-	3: "REJECTED",
-	4: "REVOKED",
-}
-
-func (e WotStatusType) String() string {
-	if v, ok := WotStatusTypeRevMap[e]; ok {
-		return v
-	}
-	return fmt.Sprintf("%v", int(e))
-}

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
 
@@ -9,12 +9,11 @@ import (
 )
 
 type CurrentStatus struct {
-	Configured     bool   `codec:"configured" json:"configured"`
+	Configured     bool  `codec:"configured" json:"configured"`
-	Registered     bool   `codec:"registered" json:"registered"`
+	Registered     bool  `codec:"registered" json:"registered"`
-	LoggedIn       bool   `codec:"loggedIn" json:"loggedIn"`
+	LoggedIn       bool  `codec:"loggedIn" json:"loggedIn"`
-	SessionIsValid bool   `codec:"sessionIsValid" json:"sessionIsValid"`
+	SessionIsValid bool  `codec:"sessionIsValid" json:"sessionIsValid"`
-	User           *User  `codec:"user,omitempty" json:"user,omitempty"`
+	User           *User `codec:"user,omitempty" json:"user,omitempty"`
-	DeviceName     string `codec:"deviceName" json:"deviceName"`
 }
 
 func (o CurrentStatus) DeepCopy() CurrentStatus {
@@ -30,7 +29,6 @@ func (o CurrentStatus) DeepCopy() CurrentStatus {
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.User),
-		DeviceName: o.DeviceName,
 	}
 }
 
@@ -333,7 +331,6 @@ type KbServiceStatus struct {
 	Pid     string `codec:"pid" json:"pid"`
 	Log     string `codec:"log" json:"log"`
 	EkLog   string `codec:"ekLog" json:"ekLog"`
-	PerfLog string `codec:"perfLog" json:"perfLog"`
 }
 
 func (o KbServiceStatus) DeepCopy() KbServiceStatus {
@@ -343,7 +340,6 @@ func (o KbServiceStatus) DeepCopy() KbServiceStatus {
 		Pid:     o.Pid,
 		Log:     o.Log,
 		EkLog:   o.EkLog,
-		PerfLog: o.PerfLog,
 	}
 }
 
@@ -353,7 +349,6 @@ type KBFSStatus struct {
 	Running          bool   `codec:"running" json:"running"`
 	Pid              string `codec:"pid" json:"pid"`
 	Log              string `codec:"log" json:"log"`
-	PerfLog          string `codec:"perfLog" json:"perfLog"`
 	Mount            string `codec:"mount" json:"mount"`
 }
 
@@ -364,7 +359,6 @@ func (o KBFSStatus) DeepCopy() KBFSStatus {
 		Running:          o.Running,
 		Pid:              o.Pid,
 		Log:              o.Log,
-		PerfLog:          o.PerfLog,
 		Mount:            o.Mount,
 	}
 }
@@ -404,14 +398,12 @@ func (o StartStatus) DeepCopy() StartStatus {
 }
 
 type GitStatus struct {
-	Log     string `codec:"log" json:"log"`
+	Log string `codec:"log" json:"log"`
-	PerfLog string `codec:"perfLog" json:"perfLog"`
 }
 
 func (o GitStatus) DeepCopy() GitStatus {
 	return GitStatus{
-		Log:     o.Log,
+		Log: o.Log,
-		PerfLog: o.PerfLog,
 	}
 }
 

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
 
@@ -12,7 +12,6 @@ type StatusCode int
 const (
 	StatusCode_SCOk                                        StatusCode = 0
 	StatusCode_SCInputError                                StatusCode = 100
-	StatusCode_SCAssertionParseError                       StatusCode = 101
 	StatusCode_SCLoginRequired                             StatusCode = 201
 	StatusCode_SCBadSession                                StatusCode = 202
 	StatusCode_SCBadLoginUserNotFound                      StatusCode = 203
@@ -35,13 +34,11 @@ const (
 	StatusCode_SCWrongCryptoFormat                         StatusCode = 279
 	StatusCode_SCDecryptionError                           StatusCode = 280
 	StatusCode_SCInvalidAddress                            StatusCode = 281
-	StatusCode_SCWrongCryptoMsgType                        StatusCode = 282
 	StatusCode_SCNoSession                                 StatusCode = 283
 	StatusCode_SCAccountReset                              StatusCode = 290
 	StatusCode_SCIdentifiesFailed                          StatusCode = 295
 	StatusCode_SCNoSpaceOnDevice                           StatusCode = 297
 	StatusCode_SCMerkleClientError                         StatusCode = 299
-	StatusCode_SCMerkleUpdateRoot                          StatusCode = 300
 	StatusCode_SCBadEmail                                  StatusCode = 472
 	StatusCode_SCRateLimit                                 StatusCode = 602
 	StatusCode_SCBadSignupUsernameTaken                    StatusCode = 701
@@ -72,7 +69,6 @@ const (
 	StatusCode_SCKeyDuplicateUpdate                        StatusCode = 921
 	StatusCode_SCSibkeyAlreadyExists                       StatusCode = 922
 	StatusCode_SCDecryptionKeyNotFound                     StatusCode = 924
-	StatusCode_SCVerificationKeyNotFound                   StatusCode = 925
 	StatusCode_SCKeyNoPGPEncryption                        StatusCode = 927
 	StatusCode_SCKeyNoNaClEncryption                       StatusCode = 928
 	StatusCode_SCKeySyncedPGPNotFound                      StatusCode = 929
@@ -106,7 +102,6 @@ const (
 	StatusCode_SCGenericAPIError                           StatusCode = 1600
 	StatusCode_SCAPINetworkError                           StatusCode = 1601
 	StatusCode_SCTimeout                                   StatusCode = 1602
-	StatusCode_SCKBFSClientTimeout                         StatusCode = 1603
 	StatusCode_SCProofError                                StatusCode = 1701
 	StatusCode_SCIdentificationExpired                     StatusCode = 1702
 	StatusCode_SCSelfNotFound                              StatusCode = 1703
@@ -148,7 +143,6 @@ const (
 	StatusCode_SCChatStalePreviousState                    StatusCode = 2518
 	StatusCode_SCChatEphemeralRetentionPolicyViolatedError StatusCode = 2519
 	StatusCode_SCChatUsersAlreadyInConversationError       StatusCode = 2520
-	StatusCode_SCChatBadConversationError                  StatusCode = 2521
 	StatusCode_SCTeamBadMembership                         StatusCode = 2604
 	StatusCode_SCTeamSelfNotOwner                          StatusCode = 2607
 	StatusCode_SCTeamNotFound                              StatusCode = 2614
@@ -159,7 +153,6 @@ const (
 	StatusCode_SCNoOp                                      StatusCode = 2638
 	StatusCode_SCTeamInviteBadCancel                       StatusCode = 2645
 	StatusCode_SCTeamInviteBadToken                        StatusCode = 2646
-	StatusCode_SCTeamBadNameReservedDB                     StatusCode = 2650
 	StatusCode_SCTeamTarDuplicate                          StatusCode = 2663
 	StatusCode_SCTeamTarNotFound                           StatusCode = 2664
 	StatusCode_SCTeamMemberExists                          StatusCode = 2665
@@ -250,10 +243,6 @@ const (
 	StatusCode_SCTeambotKeyOldBoxedGeneration              StatusCode = 3801
 	StatusCode_SCTeambotKeyBadGeneration                   StatusCode = 3802
 	StatusCode_SCAirdropRegisterFailedMisc                 StatusCode = 4207
-	StatusCode_SCSimpleFSNameExists                        StatusCode = 5101
-	StatusCode_SCSimpleFSDirNotEmpty                       StatusCode = 5102
-	StatusCode_SCSimpleFSNotExist                          StatusCode = 5103
-	StatusCode_SCSimpleFSNoAccess                          StatusCode = 5104
 )
 
 func (o StatusCode) DeepCopy() StatusCode { return o }
@@ -261,7 +250,6 @@ func (o StatusCode) DeepCopy() StatusCode { return o }
 var StatusCodeMap = map[string]StatusCode{
 	"SCOk":                        0,
 	"SCInputError":                100,
-	"SCAssertionParseError":       101,
 	"SCLoginRequired":             201,
 	"SCBadSession":                202,
 	"SCBadLoginUserNotFound":      203,
@@ -284,13 +272,11 @@ var StatusCodeMap = map[string]StatusCode{
 	"SCWrongCryptoFormat":         279,
 	"SCDecryptionError":           280,
 	"SCInvalidAddress":            281,
-	"SCWrongCryptoMsgType":        282,
 	"SCNoSession":                 283,
 	"SCAccountReset":              290,
 	"SCIdentifiesFailed":          295,
 	"SCNoSpaceOnDevice":           297,
 	"SCMerkleClientError":         299,
-	"SCMerkleUpdateRoot":          300,
 	"SCBadEmail":                  472,
 	"SCRateLimit":                 602,
 	"SCBadSignupUsernameTaken":    701,
@@ -321,7 +307,6 @@ var StatusCodeMap = map[string]StatusCode{
 	"SCKeyDuplicateUpdate":        921,
 	"SCSibkeyAlreadyExists":       922,
 	"SCDecryptionKeyNotFound":     924,
-	"SCVerificationKeyNotFound":   925,
 	"SCKeyNoPGPEncryption":        927,
 	"SCKeyNoNaClEncryption":       928,
 	"SCKeySyncedPGPNotFound":      929,
@@ -355,7 +340,6 @@ var StatusCodeMap = map[string]StatusCode{
 	"SCGenericAPIError":           1600,
 	"SCAPINetworkError":           1601,
 	"SCTimeout":                   1602,
-	"SCKBFSClientTimeout":         1603,
 	"SCProofError":                1701,
 	"SCIdentificationExpired":     1702,
 	"SCSelfNotFound":              1703,
@@ -397,7 +381,6 @@ var StatusCodeMap = map[string]StatusCode{
 	"SCChatStalePreviousState":    2518,
 	"SCChatEphemeralRetentionPolicyViolatedError": 2519,
 	"SCChatUsersAlreadyInConversationError":       2520,
-	"SCChatBadConversationError":                  2521,
 	"SCTeamBadMembership":                         2604,
 	"SCTeamSelfNotOwner":                          2607,
 	"SCTeamNotFound":                              2614,
@@ -408,7 +391,6 @@ var StatusCodeMap = map[string]StatusCode{
 	"SCNoOp":                                      2638,
 	"SCTeamInviteBadCancel":                       2645,
 	"SCTeamInviteBadToken":                        2646,
-	"SCTeamBadNameReservedDB":                     2650,
 	"SCTeamTarDuplicate":                          2663,
 	"SCTeamTarNotFound":                           2664,
 	"SCTeamMemberExists":                          2665,
@@ -499,16 +481,11 @@ var StatusCodeMap = map[string]StatusCode{
 	"SCTeambotKeyOldBoxedGeneration":              3801,
 	"SCTeambotKeyBadGeneration":                   3802,
 	"SCAirdropRegisterFailedMisc":                 4207,
-	"SCSimpleFSNameExists":                        5101,
-	"SCSimpleFSDirNotEmpty":                       5102,
-	"SCSimpleFSNotExist":                          5103,
-	"SCSimpleFSNoAccess":                          5104,
 }
 
 var StatusCodeRevMap = map[StatusCode]string{
 	0:    "SCOk",
 	100:  "SCInputError",
-	101:  "SCAssertionParseError",
 	201:  "SCLoginRequired",
 	202:  "SCBadSession",
 	203:  "SCBadLoginUserNotFound",
@@ -531,13 +508,11 @@ var StatusCodeRevMap = map[StatusCode]string{
 	279:  "SCWrongCryptoFormat",
 	280:  "SCDecryptionError",
 	281:  "SCInvalidAddress",
-	282:  "SCWrongCryptoMsgType",
 	283:  "SCNoSession",
 	290:  "SCAccountReset",
 	295:  "SCIdentifiesFailed",
 	297:  "SCNoSpaceOnDevice",
 	299:  "SCMerkleClientError",
-	300:  "SCMerkleUpdateRoot",
 	472:  "SCBadEmail",
 	602:  "SCRateLimit",
 	701:  "SCBadSignupUsernameTaken",
@@ -568,7 +543,6 @@ var StatusCodeRevMap = map[StatusCode]string{
 	921:  "SCKeyDuplicateUpdate",
 	922:  "SCSibkeyAlreadyExists",
 	924:  "SCDecryptionKeyNotFound",
-	925:  "SCVerificationKeyNotFound",
 	927:  "SCKeyNoPGPEncryption",
 	928:  "SCKeyNoNaClEncryption",
 	929:  "SCKeySyncedPGPNotFound",
@@ -602,7 +576,6 @@ var StatusCodeRevMap = map[StatusCode]string{
 	1600: "SCGenericAPIError",
 	1601: "SCAPINetworkError",
 	1602: "SCTimeout",
-	1603: "SCKBFSClientTimeout",
 	1701: "SCProofError",
 	1702: "SCIdentificationExpired",
 	1703: "SCSelfNotFound",
@@ -644,7 +617,6 @@ var StatusCodeRevMap = map[StatusCode]string{
 	2518: "SCChatStalePreviousState",
 	2519: "SCChatEphemeralRetentionPolicyViolatedError",
 	2520: "SCChatUsersAlreadyInConversationError",
-	2521: "SCChatBadConversationError",
 	2604: "SCTeamBadMembership",
 	2607: "SCTeamSelfNotOwner",
 	2614: "SCTeamNotFound",
@@ -655,7 +627,6 @@ var StatusCodeRevMap = map[StatusCode]string{
 	2638: "SCNoOp",
 	2645: "SCTeamInviteBadCancel",
 	2646: "SCTeamInviteBadToken",
-	2650: "SCTeamBadNameReservedDB",
 	2663: "SCTeamTarDuplicate",
 	2664: "SCTeamTarNotFound",
 	2665: "SCTeamMemberExists",
@@ -746,10 +717,6 @@ var StatusCodeRevMap = map[StatusCode]string{
 	3801: "SCTeambotKeyOldBoxedGeneration",
 	3802: "SCTeambotKeyBadGeneration",
 	4207: "SCAirdropRegisterFailedMisc",
-	5101: "SCSimpleFSNameExists",
-	5102: "SCSimpleFSDirNotEmpty",
-	5103: "SCSimpleFSNotExist",
-	5104: "SCSimpleFSNoAccess",
 }
 
 func (e StatusCode) String() string {

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
 
@@ -128,22 +128,21 @@ func (o Identify3RowMeta) DeepCopy() Identify3RowMeta {
 }
 
 type Identify3Row struct {
-	GuiID                Identify3GUIID     `codec:"guiID" json:"guiID"`
+	GuiID         Identify3GUIID     `codec:"guiID" json:"guiID"`
-	Key                  string             `codec:"key" json:"key"`
+	Key           string             `codec:"key" json:"key"`
-	Value                string             `codec:"value" json:"value"`
+	Value         string             `codec:"value" json:"value"`
-	Priority             int                `codec:"priority" json:"priority"`
+	Priority      int                `codec:"priority" json:"priority"`
-	SiteURL              string             `codec:"siteURL" json:"siteURL"`
+	SiteURL       string             `codec:"siteURL" json:"siteURL"`
-	SiteIcon             []SizedImage       `codec:"siteIcon" json:"siteIcon"`
+	SiteIcon      []SizedImage       `codec:"siteIcon" json:"siteIcon"`
-	SiteIconDarkmode     []SizedImage       `codec:"siteIconDarkmode" json:"siteIconDarkmode"`
+	SiteIconFull  []SizedImage       `codec:"siteIconFull" json:"siteIconFull"`
-	SiteIconFull         []SizedImage       `codec:"siteIconFull" json:"siteIconFull"`
+	SiteIconWhite []SizedImage       `codec:"siteIconWhite" json:"siteIconWhite"`
-	SiteIconFullDarkmode []SizedImage       `codec:"siteIconFullDarkmode" json:"siteIconFullDarkmode"`
+	ProofURL      string             `codec:"proofURL" json:"proofURL"`
-	ProofURL             string             `codec:"proofURL" json:"proofURL"`
+	SigID         SigID              `codec:"sigID" json:"sigID"`
-	SigID                SigID              `codec:"sigID" json:"sigID"`
+	Ctime         Time               `codec:"ctime" json:"ctime"`
-	Ctime                Time               `codec:"ctime" json:"ctime"`
+	State         Identify3RowState  `codec:"state" json:"state"`
-	State                Identify3RowState  `codec:"state" json:"state"`
+	Metas         []Identify3RowMeta `codec:"metas" json:"metas"`
-	Metas                []Identify3RowMeta `codec:"metas" json:"metas"`
+	Color         Identify3RowColor  `codec:"color" json:"color"`
-	Color                Identify3RowColor  `codec:"color" json:"color"`
+	Kid           *KID               `codec:"kid,omitempty" json:"kid,omitempty"`
-	Kid                  *KID               `codec:"kid,omitempty" json:"kid,omitempty"`
 }
 
 func (o Identify3Row) DeepCopy() Identify3Row {
@@ -164,17 +163,6 @@ func (o Identify3Row) DeepCopy() Identify3Row {
 			}
 			return ret
 		})(o.SiteIcon),
-		SiteIconDarkmode: (func(x []SizedImage) []SizedImage {
-			if x == nil {
-				return nil
-			}
-			ret := make([]SizedImage, len(x))
-			for i, v := range x {
-				vCopy := v.DeepCopy()
-				ret[i] = vCopy
-			}
-			return ret
-		})(o.SiteIconDarkmode),
 		SiteIconFull: (func(x []SizedImage) []SizedImage {
 			if x == nil {
 				return nil
@@ -186,7 +174,7 @@ func (o Identify3Row) DeepCopy() Identify3Row {
 			}
 			return ret
 		})(o.SiteIconFull),
-		SiteIconFullDarkmode: (func(x []SizedImage) []SizedImage {
+		SiteIconWhite: (func(x []SizedImage) []SizedImage {
 			if x == nil {
 				return nil
 			}
@@ -196,7 +184,7 @@ func (o Identify3Row) DeepCopy() Identify3Row {
 				ret[i] = vCopy
 			}
 			return ret
-		})(o.SiteIconFullDarkmode),
+		})(o.SiteIconWhite),
 		ProofURL: o.ProofURL,
 		SigID:    o.SigID.DeepCopy(),
 		Ctime:    o.Ctime.DeepCopy(),
@@ -222,15 +210,3 @@ func (o Identify3Row) DeepCopy() Identify3Row {
 		})(o.Kid),
 	}
 }
-
-type Identify3Summary struct {
-	GuiID            Identify3GUIID `codec:"guiID" json:"guiID"`
-	NumProofsToCheck int            `codec:"numProofsToCheck" json:"numProofsToCheck"`
-}
-
-func (o Identify3Summary) DeepCopy() Identify3Summary {
-	return Identify3Summary{
-		GuiID:            o.GuiID.DeepCopy(),
-		NumProofsToCheck: o.NumProofsToCheck,
-	}
-}

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
 
@@ -337,33 +337,37 @@ func (o UserTeamShowcase) DeepCopy() UserTeamShowcase {
 }
 
 type UserCard struct {
-	UnverifiedNumFollowing int                `codec:"unverifiedNumFollowing" json:"unverifiedNumFollowing"`
+	Following            int                `codec:"following" json:"following"`
-	UnverifiedNumFollowers int                `codec:"unverifiedNumFollowers" json:"unverifiedNumFollowers"`
+	Followers            int                `codec:"followers" json:"followers"`
-	Uid                    UID                `codec:"uid" json:"uid"`
+	Uid                  UID                `codec:"uid" json:"uid"`
-	FullName               string             `codec:"fullName" json:"fullName"`
+	FullName             string             `codec:"fullName" json:"fullName"`
-	Location               string             `codec:"location" json:"location"`
+	Location             string             `codec:"location" json:"location"`
-	Bio                    string             `codec:"bio" json:"bio"`
+	Bio                  string             `codec:"bio" json:"bio"`
-	BioDecorated           string             `codec:"bioDecorated" json:"bioDecorated"`
+	BioDecorated         string             `codec:"bioDecorated" json:"bioDecorated"`
-	Website                string             `codec:"website" json:"website"`
+	Website              string             `codec:"website" json:"website"`
-	Twitter                string             `codec:"twitter" json:"twitter"`
+	Twitter              string             `codec:"twitter" json:"twitter"`
-	TeamShowcase           []UserTeamShowcase `codec:"teamShowcase" json:"teamShowcase"`
+	YouFollowThem        bool               `codec:"youFollowThem" json:"youFollowThem"`
-	RegisteredForAirdrop   bool               `codec:"registeredForAirdrop" json:"registeredForAirdrop"`
+	TheyFollowYou        bool               `codec:"theyFollowYou" json:"theyFollowYou"`
-	StellarHidden          bool               `codec:"stellarHidden" json:"stellarHidden"`
+	TeamShowcase         []UserTeamShowcase `codec:"teamShowcase" json:"teamShowcase"`
-	Blocked                bool               `codec:"blocked" json:"blocked"`
+	RegisteredForAirdrop bool               `codec:"registeredForAirdrop" json:"registeredForAirdrop"`
-	HidFromFollowers       bool               `codec:"hidFromFollowers" json:"hidFromFollowers"`
+	StellarHidden        bool               `codec:"stellarHidden" json:"stellarHidden"`
+	Blocked              bool               `codec:"blocked" json:"blocked"`
+	HidFromFollowers     bool               `codec:"hidFromFollowers" json:"hidFromFollowers"`
 }
 
 func (o UserCard) DeepCopy() UserCard {
 	return UserCard{
-		UnverifiedNumFollowing: o.UnverifiedNumFollowing,
+		Following:     o.Following,
-		UnverifiedNumFollowers: o.UnverifiedNumFollowers,
+		Followers:     o.Followers,
-		Uid:                    o.Uid.DeepCopy(),
+		Uid:           o.Uid.DeepCopy(),
-		FullName:               o.FullName,
+		FullName:      o.FullName,
-		Location:               o.Location,
+		Location:      o.Location,
-		Bio:                    o.Bio,
+		Bio:           o.Bio,
-		BioDecorated:           o.BioDecorated,
+		BioDecorated:  o.BioDecorated,
-		Website:                o.Website,
+		Website:       o.Website,
-		Twitter:                o.Twitter,
+		Twitter:       o.Twitter,
+		YouFollowThem: o.YouFollowThem,
+		TheyFollowYou: o.TheyFollowYou,
 		TeamShowcase: (func(x []UserTeamShowcase) []UserTeamShowcase {
 			if x == nil {
 				return nil

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/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/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/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,10 +1,10 @@
 // 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
 
 import (
-	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
+	gregor1 "samhofi.us/x/keybase/types/gregor1"
 )
 
 type ChatConversationID []byte
@@ -74,20 +74,6 @@ func (o ResetState) DeepCopy() ResetState {
 	}
 }
 
-type WotUpdate struct {
-	Voucher string        `codec:"voucher" json:"voucher"`
-	Vouchee string        `codec:"vouchee" json:"vouchee"`
-	Status  WotStatusType `codec:"status" json:"status"`
-}
-
-func (o WotUpdate) DeepCopy() WotUpdate {
-	return WotUpdate{
-		Voucher: o.Voucher,
-		Vouchee: o.Vouchee,
-		Status:  o.Status.DeepCopy(),
-	}
-}
-
 type BadgeState struct {
 	NewTlfs                   int                     `codec:"newTlfs" json:"newTlfs"`
 	RekeysNeeded              int                     `codec:"rekeysNeeded" json:"rekeysNeeded"`
@@ -96,33 +82,27 @@ type BadgeState struct {
 	HomeTodoItems             int                     `codec:"homeTodoItems" json:"homeTodoItems"`
 	UnverifiedEmails          int                     `codec:"unverifiedEmails" json:"unverifiedEmails"`
 	UnverifiedPhones          int                     `codec:"unverifiedPhones" json:"unverifiedPhones"`
-	SmallTeamBadgeCount       int                     `codec:"smallTeamBadgeCount" json:"smallTeamBadgeCount"`
-	BigTeamBadgeCount         int                     `codec:"bigTeamBadgeCount" json:"bigTeamBadgeCount"`
-	NewTeamAccessRequestCount int                     `codec:"newTeamAccessRequestCount" json:"newTeamAccessRequestCount"`
 	NewDevices                []DeviceID              `codec:"newDevices" json:"newDevices"`
 	RevokedDevices            []DeviceID              `codec:"revokedDevices" json:"revokedDevices"`
 	Conversations             []BadgeConversationInfo `codec:"conversations" json:"conversations"`
 	NewGitRepoGlobalUniqueIDs []string                `codec:"newGitRepoGlobalUniqueIDs" json:"newGitRepoGlobalUniqueIDs"`
 	NewTeams                  []TeamID                `codec:"newTeams" json:"newTeams"`
 	DeletedTeams              []DeletedTeamInfo       `codec:"deletedTeams" json:"deletedTeams"`
+	NewTeamAccessRequests     []TeamID                `codec:"newTeamAccessRequests" json:"newTeamAccessRequests"`
 	TeamsWithResetUsers       []TeamMemberOutReset    `codec:"teamsWithResetUsers" json:"teamsWithResetUsers"`
 	UnreadWalletAccounts      []WalletAccountInfo     `codec:"unreadWalletAccounts" json:"unreadWalletAccounts"`
-	WotUpdates                map[string]WotUpdate    `codec:"wotUpdates" json:"wotUpdates"`
 	ResetState                ResetState              `codec:"resetState" json:"resetState"`
 }
 
 func (o BadgeState) DeepCopy() BadgeState {
 	return BadgeState{
-		NewTlfs:                   o.NewTlfs,
+		NewTlfs:          o.NewTlfs,
-		RekeysNeeded:              o.RekeysNeeded,
+		RekeysNeeded:     o.RekeysNeeded,
-		NewFollowers:              o.NewFollowers,
+		NewFollowers:     o.NewFollowers,
-		InboxVers:                 o.InboxVers,
+		InboxVers:        o.InboxVers,
-		HomeTodoItems:             o.HomeTodoItems,
+		HomeTodoItems:    o.HomeTodoItems,
-		UnverifiedEmails:          o.UnverifiedEmails,
+		UnverifiedEmails: o.UnverifiedEmails,
-		UnverifiedPhones:          o.UnverifiedPhones,
+		UnverifiedPhones: o.UnverifiedPhones,
-		SmallTeamBadgeCount:       o.SmallTeamBadgeCount,
-		BigTeamBadgeCount:         o.BigTeamBadgeCount,
-		NewTeamAccessRequestCount: o.NewTeamAccessRequestCount,
 		NewDevices: (func(x []DeviceID) []DeviceID {
 			if x == nil {
 				return nil
@@ -189,6 +169,17 @@ func (o BadgeState) DeepCopy() BadgeState {
 			}
 			return ret
 		})(o.DeletedTeams),
+		NewTeamAccessRequests: (func(x []TeamID) []TeamID {
+			if x == nil {
+				return nil
+			}
+			ret := make([]TeamID, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.NewTeamAccessRequests),
 		TeamsWithResetUsers: (func(x []TeamMemberOutReset) []TeamMemberOutReset {
 			if x == nil {
 				return nil
@@ -211,32 +202,31 @@ func (o BadgeState) DeepCopy() BadgeState {
 			}
 			return ret
 		})(o.UnreadWalletAccounts),
-		WotUpdates: (func(x map[string]WotUpdate) map[string]WotUpdate {
-			if x == nil {
-				return nil
-			}
-			ret := make(map[string]WotUpdate, len(x))
-			for k, v := range x {
-				kCopy := k
-				vCopy := v.DeepCopy()
-				ret[kCopy] = vCopy
-			}
-			return ret
-		})(o.WotUpdates),
 		ResetState: o.ResetState.DeepCopy(),
 	}
 }
 
 type BadgeConversationInfo struct {
 	ConvID         ChatConversationID `codec:"convID" json:"convID"`
-	BadgeCount     int                `codec:"badgeCount" json:"badgeCount"`
+	BadgeCounts    map[DeviceType]int `codec:"badgeCounts" json:"badgeCounts"`
 	UnreadMessages int                `codec:"unreadMessages" json:"unreadMessages"`
 }
 
 func (o BadgeConversationInfo) DeepCopy() BadgeConversationInfo {
 	return BadgeConversationInfo{
-		ConvID:         o.ConvID.DeepCopy(),
+		ConvID: o.ConvID.DeepCopy(),
-		BadgeCount:     o.BadgeCount,
+		BadgeCounts: (func(x map[DeviceType]int) map[DeviceType]int {
+			if x == nil {
+				return nil
+			}
+			ret := make(map[DeviceType]int, len(x))
+			for k, v := range x {
+				kCopy := k.DeepCopy()
+				vCopy := v
+				ret[kCopy] = vCopy
+			}
+			return ret
+		})(o.BadgeCounts),
 		UnreadMessages: o.UnreadMessages,
 	}
 }

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

types/keybase1/notify_ctl.go

@@ -0,0 +1,70 @@
+// 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"`
+	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,
+		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_keyfamily.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_keyfamily.avdl
+
+package keybase1

types/keybase1/notify_paperkey.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_paperkey.avdl
+
+package keybase1

types/keybase1/notify_pgp.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_pgp.avdl
+
+package keybase1

types/keybase1/notify_phone.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_phone.avdl
+
+package keybase1