refactor: fix linter issues

Author: ErikKalkoken

internal/app/assetui/browser.go

@@ -410,9 +410,8 @@ func addNodes(td *xwidget.TreeData[assetContainerNode], parent *assetContainerNo
 		case assetSafety:
 			if isCorporation {
 				return category != asset.NodeAssetSafetyCorporation
-			} else {
-				return category != asset.NodeAssetSafetyCharacter
 			}
+			return category != asset.NodeAssetSafetyCharacter
 		}
 		return false
 	}
@@ -588,7 +587,7 @@ func newAssetBrowserContainer(ab *Browser) *assetBrowserContainer {
 	a.grid = a.makeAssetGrid()
 	a.location = newAssetBrowserLocation(a)
 
-	a.search.OnChanged = func(s string) {
+	a.search.OnChanged = func(_ string) {
 		a.filterItemsAsync()
 	}
 	a.search.ActionItem = kxwidget.NewIconButton(theme.CancelIcon(), func() {

internal/app/assetui/search.go

@@ -416,7 +416,7 @@ func newAssetSearch(u ui, forCorporation bool) *Search {
 			assetsTotalYes,
 			assetsTotalNo,
 		},
-		func(s string) {
+		func(_ string) {
 			a.filterRowsAsync(-1)
 		},
 	)
@@ -454,7 +454,7 @@ func newAssetSearch(u ui, forCorporation bool) *Search {
 		a.u.Signals().CharacterRemoved.AddListener(func(ctx context.Context, _ *app.EntityShort) {
 			a.Update(ctx)
 		})
-		a.u.Signals().TagsChanged.AddListener(func(ctx context.Context, s struct{}) {
+		a.u.Signals().TagsChanged.AddListener(func(ctx context.Context, _ struct{}) {
 			a.Update(ctx)
 		})
 		a.u.Signals().CorporationSectionChanged.AddListener(func(ctx context.Context, arg app.CorporationSectionUpdated) {

internal/app/awidget/mailheader.go

@@ -113,7 +113,7 @@ func NewMailHeader(loadIcon func(o *app.EveEntity, setIcon func(r fyne.Resource)
 	return w
 }
 
-func (w *MailHeader) Set(characterID int64, from *app.EveEntity, timestamp time.Time, recipients ...*app.EveEntity) {
+func (w *MailHeader) Set(from *app.EveEntity, timestamp time.Time, recipients ...*app.EveEntity) {
 	w.timestamp.Text = timestamp.Format(app.DateTimeFormat)
 	w.recipients.RemoveAll()
 	for _, r := range recipients {

internal/app/characterservice/contracts.go

@@ -41,10 +41,10 @@ func (s *CharacterService) GetContractTopBid(ctx context.Context, contractID int
 	if len(bids) == 0 {
 		return nil, app.ErrNotFound
 	}
-	var max float32
+	var maximum float32
 	var top *app.CharacterContractBid
 	for _, b := range bids {
-		if top == nil || b.Amount > max {
+		if top == nil || b.Amount > maximum {
 			top = b
 		}
 	}
@@ -211,9 +211,8 @@ func (s *CharacterService) updateContractsESI(ctx context.Context, arg character
 					if err := s.createNewContract(ctx, characterID, c); err != nil {
 						slog.Error("create contract", "contract", c, "error", err)
 						continue
-					} else {
-						count++
 					}
+					count++
 				}
 				slog.Info("Stored new contracts", "characterID", characterID, "count", count)
 			}
@@ -223,9 +222,8 @@ func (s *CharacterService) updateContractsESI(ctx context.Context, arg character
 					if err := s.updateContract(ctx, characterID, c); err != nil {
 						slog.Error("update contract", "contract", c, "error", err)
 						continue
-					} else {
-						count++
 					}
+					count++
 				}
 				slog.Info("Updated contracts", "characterID", characterID, "count", count)
 			}

internal/app/characterui/charactersheet.go

@@ -170,10 +170,10 @@ func (a *CharacterSheet) update(ctx context.Context) {
 		slog.Error("Failed to fetch character for sheet", "err", err)
 		setName("ERROR: " + a.u.ErrorDisplay(err))
 		return
-	} else {
-		a.character.Store(c2)
-		c = c2
 	}
+	a.character.Store(c2)
+	c = c2
+
 	fyne.Do(func() {
 		a.name.SetText(c.EveCharacter.Name)
 		a.name.OnTapped = func() {

internal/app/characterui/communications.go

@@ -449,7 +449,7 @@ func (w *communicationDetail) CreateRenderer() fyne.WidgetRenderer {
 
 func (w *communicationDetail) set(n *app.CharacterNotification, recipient *app.EveEntity) error {
 	w.subject.SetText(n.TitleDisplay())
-	w.header.Set(n.CharacterID, n.Sender, n.Timestamp, recipient)
+	w.header.Set(n.Sender, n.Timestamp, recipient)
 	b, err := n.BodyPlain() // using markdown blocked by #61
 	if err != nil {
 		return fmt.Errorf("failed to convert markdown for notification %+v: %w", n, err)

internal/app/characterui/contracts.go

@@ -212,7 +212,7 @@ func newContracts(u contractUIServices, forCorporation bool) *Contracts {
 			},
 			a.columnSorter,
 			a.filterRowsAsync,
-			func(column int, r contractRow) {
+			func(_ int, r contractRow) {
 				if a.forCorporation {
 					ShowCorporationContractWindow(a.u, r.corporationID, r.contractID)
 				} else {
@@ -277,7 +277,7 @@ func newContracts(u contractUIServices, forCorporation bool) *Contracts {
 		a.u.Signals().CharacterRemoved.AddListener(func(ctx context.Context, _ *app.EntityShort) {
 			a.Update(ctx)
 		})
-		a.u.Signals().TagsChanged.AddListener(func(ctx context.Context, s struct{}) {
+		a.u.Signals().TagsChanged.AddListener(func(ctx context.Context, _ struct{}) {
 			a.Update(ctx)
 		})
 	}
@@ -315,14 +315,14 @@ func (a *Contracts) makeDataList() *xwidget.StripedList {
 		},
 		func() fyne.CanvasObject {
 			title := widget.NewLabelWithStyle("Template", fyne.TextAlignLeading, fyne.TextStyle{Bold: true})
-			type_ := widget.NewLabel("Template")
+			et := widget.NewLabel("Template")
 			status := xwidget.NewRichTextWithText("Template")
 			issuer := widget.NewLabel("Template")
 			assignee := widget.NewLabel("Template")
 			dateExpired := xwidget.NewRichTextWithText("Template")
 			return container.New(layout.NewCustomPaddedVBoxLayout(-p),
 				title,
-				container.NewHBox(type_, layout.NewSpacer(), status),
+				container.NewHBox(et, layout.NewSpacer(), status),
 				issuer,
 				assignee,
 				dateExpired,
@@ -374,7 +374,7 @@ func (a *Contracts) filterRowsAsync(sortCol int) {
 	rows := slices.Clone(a.rows)
 	issuer := a.selectIssuer.Selected
 	assignee := a.selectAssignee.Selected
-	type_ := a.selectType.Selected
+	et := a.selectType.Selected
 	tag := a.selectTag.Selected
 	sortCol, dir, doSort := a.columnSorter.CalcSort(sortCol)
 
@@ -405,9 +405,9 @@ func (a *Contracts) filterRowsAsync(sortCol int) {
 				return r.assigneeName != assignee
 			})
 		}
-		if type_ != "" {
+		if et != "" {
 			rows = slices.DeleteFunc(rows, func(r contractRow) bool {
-				return r.typeName != type_
+				return r.typeName != et
 			})
 		}
 		if tag != "" {

internal/app/characterui/mails.go

@@ -868,7 +868,7 @@ func (w *mailDetail) clear() {
 func (w *mailDetail) SetMail(m *app.CharacterMail) {
 	w.subject.SetText(m.Subject.ValueOrZero())
 	w.SetBody(m.BodyPlain())
-	w.header.Set(m.CharacterID, m.From, m.Timestamp, m.Recipients...)
+	w.header.Set(m.From, m.Timestamp, m.Recipients...)
 }
 
 func (w *mailDetail) SetBody(s string) {

internal/app/characterui/overview.go

@@ -168,7 +168,7 @@ func NewOverview(u ui) *Overview {
 		a.search.SetText("")
 		a.filterRowsAsync(-1)
 	})
-	a.search.OnChanged = func(s string) {
+	a.search.OnChanged = func(_ string) {
 		a.filterRowsAsync(-1)
 	}
 	a.search.PlaceHolder = "Search characters and systems"
@@ -215,7 +215,7 @@ func NewOverview(u ui) *Overview {
 	a.u.Signals().CharacterRemoved.AddListener(func(ctx context.Context, _ *app.EntityShort) {
 		a.Update(ctx)
 	})
-	a.u.Signals().TagsChanged.AddListener(func(ctx context.Context, s struct{}) {
+	a.u.Signals().TagsChanged.AddListener(func(ctx context.Context, _ struct{}) {
 		a.Update(ctx)
 	})
 	a.u.Signals().CharacterSectionChanged.AddListener(func(ctx context.Context, arg app.CharacterSectionUpdated) {

internal/app/characterui/sendmail.go

@@ -399,7 +399,7 @@ func (w *eveEntityBadge) Cursor() desktop.Cursor {
 }
 
 // MouseIn is a hook that is called if the mouse pointer enters the element.
-func (w *eveEntityBadge) MouseIn(e *desktop.MouseEvent) {
+func (w *eveEntityBadge) MouseIn(_ *desktop.MouseEvent) {
 	if w.Disabled() {
 		return
 	}