format code + make showing avatars in member lists optional

cache.go

@@ -5,6 +5,7 @@ package main
 
 import (
 	"crypto/sha256"
+	"errors"
 	"fmt"
 	"github.com/diamondburned/gotk4/pkg/gdk/v4"
 	"github.com/diamondburned/gotk4/pkg/gtk/v4"
@@ -14,7 +15,6 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
-	"errors"
 )
 
 // global or app-level map/cache

gtk-helpers.go

@@ -196,7 +196,7 @@ func switchToTab(jid string, w *gtk.Window) {
 				}
 			}
 
-			status := gtk.NewImageFromPaintable(clientAssetsLoad("status_"+string(u.Show)))
+			status := gtk.NewImageFromPaintable(clientAssetsLoad("status_" + string(u.Show)))
 			status.SetTooltipText(string(u.Show))
 
 			status.SetHAlign(gtk.AlignEnd)
@@ -217,21 +217,23 @@ func switchToTab(jid string, w *gtk.Window) {
 			medal.SetHExpand(true)
 			userbox.Append(medal)
 
-			default_av := createIdenticon(u.From, false)
+			if loadedConfig.ShowAvatarsInMemberList {
-			userbox.Prepend(default_av)
+				default_av := createIdenticon(u.From, false)
-			var vcu VCardUpdate
+				userbox.Prepend(default_av)
-			ok = u.Get(&vcu)
+				var vcu VCardUpdate
-			if ok {
+				ok = u.Get(&vcu)
-				photo := vcu.Photo
+				if ok {
-				go func() {
+					photo := vcu.Photo
-					new_im := getAvatar(u.From, photo)
+					go func() {
+						new_im := getAvatar(u.From, photo)
 
-					glib.IdleAdd(func() {
+						glib.IdleAdd(func() {
-						userbox.Remove(default_av)
+							userbox.Remove(default_av)
-						userbox.Prepend(new_im)
+							userbox.Prepend(new_im)
-					})
+						})
-				}()
+					}()
 
+				}
 			}
 
 			gesture := gtk.NewGestureClick()

gtk-signin.go

@@ -93,6 +93,7 @@ func dropToSignInPage(err error) {
 			conf.Insecure = insecure_check.Active()
 			conf.JoinBookmarks = true
 			conf.Resource = randomClientResource()
+			conf.ShowAvatarsInMemberList = true
 
 			var b bytes.Buffer
 			e := toml.NewEncoder(&b)

main.go

@@ -76,7 +76,6 @@ var userdevices sync.Map
 
 var pingTimes = [][]float64{}
 
-
 var xmlLog *os.File
 
 func init() {

types.go

@@ -16,19 +16,20 @@ type chatTab struct {
 }
 
 type lambdaConfig struct {
-	Server              string
+	Server                  string
-	Username            string
+	Username                string
-	Resource            string
+	Resource                string
-	Password            string
+	Password                string
-	Insecure            bool
+	Insecure                bool
-	Nick                string
+	Nick                    string
-	JoinBookmarks       bool
+	JoinBookmarks           bool
-	CVD                 color.CVD
+	CVD                     color.CVD
-	Identicons          bool
+	Identicons              bool
-	Debug               bool
+	Debug                   bool
-	ShowPresenceUpdates bool
+	ShowPresenceUpdates     bool
-	CompactMode         bool
+	CompactMode             bool
-	CustomNicks         map[string]string
+	ShowAvatarsInMemberList bool
+	CustomNicks             map[string]string
 }
 
 type mucUnit struct {