peer cleanup

client/peer.go

@@ -16,6 +16,7 @@ import (
 //   - Utility functions for packing/unpacking, encrypting/decrypting messages for peer communication
 type Peer struct {
 	Name     string `json:"name,omitempty"`
+	Avatar   string `json:"avatar,omitempty"`
 	MyName   string `json:"my_name,omitempty"`
 	MyAvatar string `json:"my_avatar,omitempty"`
 	//	Conversation        []InternalMessage `json:"conversation,omitempty"`
@@ -33,10 +34,10 @@ type Peer struct {
 	PasswordType        string    `json:"password_type,omitempty"`
 	Blocked             bool      `json:"blocked,omitempty"`
 	MessageNotification string    `json:"message_notification,omitempty"`
-	OnionMode           bool      `json:"onion_mode,omitempty"`
+	MatriochkaMode      bool      `json:"matriochka_mode,omitempty"`
+	DirectMode          bool      `json:"direct_mode,omitempty"`
 	LastMessage         time.Time `json:"last_message,omitempty"`
 	DbIds               []string  `json:"db_ids,omitempty"`
-	AvatarUuid          string    `json:"avatar_uid,omitempty"`
 	dbPassword          string
 }