Add extra fields to vCard and format code

assets.go

@@ -144,7 +144,6 @@ func loadAsset(key string, data []byte) {
 	clientAssets[key] = gdk.NewTextureForPixbuf(loader.Pixbuf())
 }
 
-
 func init() {
 	for key, data := range map[string][]byte{
 		"DefaultAvatar":         defaultAvatarBytes,

l18n.go

@@ -100,11 +100,11 @@ var enGB = map[string]string{ // British English
 	"SIInsecureLabelTooltip": "Tick this if you need to connect without TLS, usually for connecting to Tor XMPP servers",
 }
 
-var kaGE = map[string]string { // Georgian (Georgia)
+var kaGE = map[string]string{ // Georgian (Georgia)
 
 }
 
-var roRo = map[string]string { // Romanian (Romania)
+var roRo = map[string]string{ // Romanian (Romania)
 	"appName":                    "Lambda",
 	"cancel":                     "Canselează",
 	"submit":                     "A preda",
@@ -127,8 +127,7 @@ var roRo = map[string]string { // Romanian (Romania)
 
 var enUS = enGB // American English
 
-
+var locales = map[string]map[string]string{
-var locales = map[string]map[string]string {
 	"en_GB": enGB,
 	"ka_GE": kaGE,
 	"en_US": enUS,

main.go

@@ -880,7 +880,6 @@ func activate(app *gtk.Application) {
 							warning_box.Append(box)
 						}
 
-
 						for _, feature := range features {
 							switch feature.Var {
 							case "muc_passwordprotected":

xmpp-vcard.go

@@ -10,7 +10,21 @@ import (
 
 type VCard struct {
 	XMLName     xml.Name          `xml:"vcard-temp vCard"`
+	FirstName   string            `xml:"FN"`
+	LastName    string            `xml:"N>FAMILY"`
+	GivenName   string            `xml:"N>GIVEN"`
+	MiddleName  string            `xml:"N>MIDDLE"`
+	Nickname    string            `xml:"NICKNAME"`
+	URI         string            `xml:"URL"`
+	Birthday    string            `xml:"BDAY"`
+	OrgName     string            `xml:"ORG>ORGNAME"`
+	OrgUnit     string            `xml:"ORG>ORGUNIT"`
+	Title       string            `xml:"TITLE"`
+	Role        string            `xml:"ROLE"`
+	Description string            `xml:"DESC"`
+	Jid         string            `xml:"JABBERID"`
 	Photo       Photo             `xml:"PHOTO"`
+	Email       string            `xml:"EMAIL>USERID"`
 	ResultSet   *stanza.ResultSet `xml:"set,omitempty"`
 }