From 8e2e4b42d9ee7f208fc5bf702e84b003e5ecade0 Mon Sep 17 00:00:00 2001 From: sunglocto Date: Sat, 17 Jan 2026 13:30:05 +0000 Subject: [PATCH] format code --- main.go | 65 +++++++++++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/main.go b/main.go index 8610c69..20f5b7c 100644 --- a/main.go +++ b/main.go @@ -6,29 +6,29 @@ import ( "fyne.io/fyne/v2/app" "fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/container" - "fyne.io/fyne/v2/storage" "fyne.io/fyne/v2/dialog" "fyne.io/fyne/v2/layout" + "fyne.io/fyne/v2/storage" "fyne.io/fyne/v2/widget" "github.com/google/uuid" + "github.com/k3a/html2text" "github.com/kirsle/configdir" "github.com/mattn/go-mastodon" - "github.com/k3a/html2text" /*webview "github.com/webview/webview_go"*/ "encoding/json" - "path/filepath" - "net/url" _ "net/http" + "net/url" + "path/filepath" "context" "errors" "fmt" "log" "os" - _ "time" "strings" + _ "time" ) var App fyne.App @@ -75,7 +75,7 @@ var ProfileSelectionDone bool = false var ProfileSelectionProfile *HashbangProfile // The visibility that the post is going to be posted with -var PostVisibility string = "public" +var PostVisibility string = "public" var ReplyIDEntry *widget.Entry @@ -182,12 +182,12 @@ func ProfileLaunch() { // Step two: the user now needs to log in /* - Webview := webview.New(false) - defer Webview.Destroy() - Webview.SetTitle("Authenticate - copy the authorisation code when logged in.") - Webview.SetSize(480, 320, webview.HintNone) - Webview.Navigate(app.AuthURI) - Webview.Run() + Webview := webview.New(false) + defer Webview.Destroy() + Webview.SetTitle("Authenticate - copy the authorisation code when logged in.") + Webview.SetSize(480, 320, webview.HintNone) + Webview.Navigate(app.AuthURI) + Webview.Run() */ u, err := url.Parse(app.AuthURI) if err != nil { @@ -269,10 +269,10 @@ func ProfileLaunch() { for _, v := range Profiles { ext := "" btn := widget.NewButton("Log in", func() { - ProfileSelectionDone = true - ProfileSelectionProfile = v - MainWindow.Close() - }) + ProfileSelectionDone = true + ProfileSelectionProfile = v + MainWindow.Close() + }) if v.InternalName == LoadedConfig.ProfileName { ext = "🚪 " @@ -283,7 +283,6 @@ func ProfileLaunch() { btn.Text = ext + btn.Text - ProfileSelection.Add( container.NewHBox( widget.NewLabel(v.Name), @@ -419,7 +418,7 @@ func main() { Timeline := container.NewGridWithColumns(4) PostTimeline := container.NewVBox(widget.NewLabel("Posts")) - + VisibilitySelector := widget.NewSelect([]string{"public", "unlisted", "private", "direct"}, func(value string) { PostVisibility = value }) @@ -443,9 +442,8 @@ func main() { continue } - im := canvas.NewImageFromURI(u) - im.Resize(fyne.NewSize(25,25)) + im.Resize(fyne.NewSize(25, 25)) im.FillMode = canvas.ImageFillContain lab := widget.NewLabel(fmt.Sprintf("%s: %s", status.Account.Username, html2text.HTML2Text(status.Content))) lab.Selectable = true @@ -489,18 +487,18 @@ func main() { continue } - im := canvas.NewImageFromURI(u) im.FillMode = canvas.ImageFillCover - fyne.Do(func(){Timeline.Add(im) - ml := widget.NewRichTextFromMarkdown(fmt.Sprintf("%s %s your post", v.Account.Username, v.Type)) - ml.Wrapping = fyne.TextWrapWord - Timeline.Add(ml) - Timeline.Add(label) - tw := widget.NewLabel(timestring) - tw.Wrapping = fyne.TextWrapWord - Timeline.Add(tw) - }) + fyne.Do(func() { + Timeline.Add(im) + ml := widget.NewRichTextFromMarkdown(fmt.Sprintf("%s %s your post", v.Account.Username, v.Type)) + ml.Wrapping = fyne.TextWrapWord + Timeline.Add(ml) + Timeline.Add(label) + tw := widget.NewLabel(timestring) + tw.Wrapping = fyne.TextWrapWord + Timeline.Add(tw) + }) } //Timeline = NewTimeline } @@ -508,16 +506,15 @@ func main() { go ShowNotifications() go ShowTimeline() - RefreshAll := widget.NewButton("Refresh", func(){ + RefreshAll := widget.NewButton("Refresh", func() { ShowNotifications() ShowTimeline() }) - MainWindow.SetContent(container.NewVSplit(container.NewVScroll(PostTimeline), container.NewHSplit(container.NewVBox(TootEntry, ReplyBox, VisibilitySelector, widget.NewButton("Post", func() { toot := mastodon.Toot{ - Status: TootEntry.Text, - Visibility: PostVisibility, + Status: TootEntry.Text, + Visibility: PostVisibility, InReplyToID: mastodon.ID(ReplyIDEntry.Text), }