Merge branch 'main' into message-types

Author: xqrs

README.md

@@ -72,3 +72,10 @@ Discordo uses the default configuration if a configuration file is not found in
 
 > [!IMPORTANT]
 > Automated user accounts or "self-bots" are against Discord's Terms of Service. I am not responsible for any loss caused by using "self-bots" or Discordo.
+
+## License
+
+Copyright (C) 2025-present ayn2op
+
+This project is licensed under the GNU General Public License v3.0 (GPL-3.0).
+See the [LICENSE](./LICENSE) file for the full license text.

cmd/root.go

@@ -8,7 +8,9 @@ import (
 	"github.com/ayn2op/discordo/internal/config"
 	"github.com/ayn2op/discordo/internal/logger"
 	"github.com/ayn2op/discordo/internal/ui/root"
+	"github.com/ayn2op/tview"
 	"github.com/diamondburned/arikawa/v3/utils/ws"
+	"github.com/gdamore/tcell/v3"
 )
 
 var (
@@ -45,5 +47,24 @@ func Run() error {
 		return fmt.Errorf("failed to load config: %w", err)
 	}
 
-	return root.NewView(cfg).Run()
+	screen, err := tcell.NewScreen()
+	if err != nil {
+		return fmt.Errorf("failed to create screen: %w", err)
+	}
+
+	if err := screen.Init(); err != nil {
+		return fmt.Errorf("failed to init screen: %w", err)
+	}
+
+	if cfg.Mouse {
+		screen.EnableMouse()
+	}
+	screen.EnablePaste()
+	screen.EnableFocus()
+
+	tview.Styles = tview.Theme{}
+	app := tview.NewApplication()
+	app.SetRoot(root.NewModel(cfg, app))
+	app.SetScreen(screen)
+	return app.Run()
 }

go.mod

@@ -1,30 +1,33 @@
 module github.com/ayn2op/discordo
 
-go 1.25.3
+go 1.26.0
 
 // replace github.com/ayn2op/tview => ../tview
 
+// replace github.com/diamondburned/arikawa/v3 => ../arikawa
+
 require (
 	github.com/BurntSushi/toml v1.6.0
 	github.com/alecthomas/chroma/v2 v2.23.1
 	github.com/andybalholm/brotli v1.2.0
-	github.com/ayn2op/tview v0.0.0-20260225014619-7f27f376aea9
+	github.com/ayn2op/clipboard v0.0.0-20260308203959-c5ad7df3fc97
+	github.com/ayn2op/tview v0.0.0-20260311012550-9b46cad522bf
 	github.com/deckarep/gosx-notifier v0.0.0-20180201035817-e127226297fb
-	github.com/diamondburned/arikawa/v3 v3.6.1-0.20260226015332-783a3e8e8e86
-	github.com/diamondburned/ningen/v3 v3.0.1-0.20250920191746-98fbd92e134d
+	github.com/diamondburned/arikawa/v3 v3.6.1-0.20260309010533-e61165a61b64
+	github.com/diamondburned/ningen/v3 v3.0.1-0.20260306213430-5a08d3a709b4
 	github.com/gdamore/tcell/v3 v3.1.2
 	github.com/gen2brain/beeep v0.11.2
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.3
 	github.com/klauspost/compress v1.18.4
 	github.com/ncruces/zenity v0.10.14
+	github.com/rivo/uniseg v0.4.7
 	github.com/sahilm/fuzzy v0.1.1
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/yuin/goldmark v1.7.16
 	github.com/zalando/go-keyring v0.2.6
-	golang.design/x/clipboard v0.7.1
 )
 
 require (
@@ -45,7 +48,6 @@ require (
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/randall77/makefat v0.0.0-20210315173500-7ddd0e42c844 // indirect
-	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/sergeymakinen/go-bmp v1.0.0 // indirect
 	github.com/sergeymakinen/go-ico v1.0.0 // indirect
 	github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect
@@ -54,8 +56,8 @@ require (
 	golang.org/x/exp/shiny v0.0.0-20260218203240-3dfff04db8fa // indirect
 	golang.org/x/image v0.36.0 // indirect
 	golang.org/x/mobile v0.0.0-20260217195705-b56b3793a9c4 // indirect
-	golang.org/x/sys v0.41.0 // indirect
+	golang.org/x/sys v0.42.0 // indirect
 	golang.org/x/term v0.40.0 // indirect
 	golang.org/x/text v0.34.0 // indirect
-	golang.org/x/time v0.14.0 // indirect
+	golang.org/x/time v0.15.0 // indirect
 )

go.sum

@@ -14,8 +14,10 @@ github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs
 github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
 github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
-github.com/ayn2op/tview v0.0.0-20260225014619-7f27f376aea9 h1:6zEOzR3v3bylvKLrNUiQ2ykVGzZilVKypdUU3EcVK7c=
-github.com/ayn2op/tview v0.0.0-20260225014619-7f27f376aea9/go.mod h1:lZ8RdOegQWBQafTOasGE7Ps1/Ymy4jmXoPt5vz2QsS0=
+github.com/ayn2op/clipboard v0.0.0-20260308203959-c5ad7df3fc97 h1:WujETUV+v0DEJyZgjeLzQvihWyL80c0Tg4qf0dDo+Io=
+github.com/ayn2op/clipboard v0.0.0-20260308203959-c5ad7df3fc97/go.mod h1:3kFnpNCa3dF6WryzOMCDao7PfZ7DTCh+pievlfuwV80=
+github.com/ayn2op/tview v0.0.0-20260311012550-9b46cad522bf h1:ay4OtKYsFGvK4Ng1pmZ/n8MA1CWzZO80lDlrDiCpdag=
+github.com/ayn2op/tview v0.0.0-20260311012550-9b46cad522bf/go.mod h1:lZ8RdOegQWBQafTOasGE7Ps1/Ymy4jmXoPt5vz2QsS0=
 github.com/danieljoos/wincred v1.2.3 h1:v7dZC2x32Ut3nEfRH+vhoZGvN72+dQ/snVXo/vMFLdQ=
 github.com/danieljoos/wincred v1.2.3/go.mod h1:6qqX0WNrS4RzPZ1tnroDzq9kY3fu1KwE7MRLQK4X0bs=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -25,10 +27,10 @@ github.com/dchest/jsmin v1.0.0 h1:Y2hWXmGZiRxtl+VcTksyucgTlYxnhPzTozCwx9gy9zI=
 github.com/dchest/jsmin v1.0.0/go.mod h1:AVBIund7Mr7lKXT70hKT2YgL3XEXUaUk5iw9DZ8b0Uc=
 github.com/deckarep/gosx-notifier v0.0.0-20180201035817-e127226297fb h1:6S+TKObz6+Io2c8IOkcbK4Sz7nj6RpEVU7TkvmsZZcw=
 github.com/deckarep/gosx-notifier v0.0.0-20180201035817-e127226297fb/go.mod h1:wf3nKtOnQqCp7kp9xB7hHnNlZ6m3NoiOxjrB9hFRq4Y=
-github.com/diamondburned/arikawa/v3 v3.6.1-0.20260226015332-783a3e8e8e86 h1:GJdiEzVS9Y7uUDfTmeChn9KWw+MJeS/FmNf6d8ZHQcg=
-github.com/diamondburned/arikawa/v3 v3.6.1-0.20260226015332-783a3e8e8e86/go.mod h1:TpV2GvCJIYSwAXUEAx4sutPcftyAbVidiFlG6l7K0go=
-github.com/diamondburned/ningen/v3 v3.0.1-0.20250920191746-98fbd92e134d h1:wS6HWl86RFItw38sUSdXlulj0VarV4G+9Rlv8j+p3oQ=
-github.com/diamondburned/ningen/v3 v3.0.1-0.20250920191746-98fbd92e134d/go.mod h1:9PWnJlArEASrZQI89KQiBJBYOEDcsDyfhFcxRTL8eO4=
+github.com/diamondburned/arikawa/v3 v3.6.1-0.20260309010533-e61165a61b64 h1:ZdzbwItbGTvOdNfoCH7QIbRiBPDufsq8AwfJUaM4mHM=
+github.com/diamondburned/arikawa/v3 v3.6.1-0.20260309010533-e61165a61b64/go.mod h1:TpV2GvCJIYSwAXUEAx4sutPcftyAbVidiFlG6l7K0go=
+github.com/diamondburned/ningen/v3 v3.0.1-0.20260306213430-5a08d3a709b4 h1:m1WyrOUuFE4BuIcQzPeRmmLQmJMBNElT/tfx/s2+AoE=
+github.com/diamondburned/ningen/v3 v3.0.1-0.20260306213430-5a08d3a709b4/go.mod h1:JSqSCBN5MAI9yjAO6tZlSayXM9KWx+8q3EhhlkCuscM=
 github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
 github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/esiqveland/notify v0.13.3 h1:QCMw6o1n+6rl+oLUfg8P1IIDSFsDEb2WlXvVvIJbI/o=
@@ -113,8 +115,6 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go4.org v0.0.0-20260112195520-a5071408f32f h1:ziUVAjmTPwQMBmYR1tbdRFJPtTcQUI12fH9QQjfb0Sw=
 go4.org v0.0.0-20260112195520-a5071408f32f/go.mod h1:ZRJnO5ZI4zAwMFp+dS1+V6J6MSyAowhRqAE+DPa1Xp0=
-golang.design/x/clipboard v0.7.1 h1:OEG3CmcYRBNnRwpDp7+uWLiZi3hrMRJpE9JkkkYtz2c=
-golang.design/x/clipboard v0.7.1/go.mod h1:i5SiIqj0wLFw9P/1D7vfILFK0KHMk7ydE72HRrUIgkg=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp/shiny v0.0.0-20260218203240-3dfff04db8fa h1:+7e7RPzOw2fG8DBbddatlOmHGNCg+VlA2Ar0yVMw7sM=
@@ -139,8 +139,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
-golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
+golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -153,8 +153,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
 golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
-golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
-golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
+golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
+golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

internal/cache/cache.go

@@ -31,7 +31,7 @@ func (c *Cache) Get(query string) uint {
 // the search limit.
 // "aa", "ab", "ac", ..., "ay" // where length is longer than the limit
 // if "ay" leaves, then "az" would not be loaded becaue it would not be
-// returned by the search results because of the search limit
+// returned by the search results because of the search limit.
 func (c *Cache) Invalidate(name string, limit uint) {
 	for name != "" {
 		if c.Exists(name) && c.Get(name) >= limit {

internal/clipboard/clipboard.go

@@ -1,10 +1,10 @@
 package clipboard
 
-import designClipb "golang.design/x/clipboard"
+import "github.com/ayn2op/clipboard"
 
-type Format = designClipb.Format
+type Format = clipboard.Format
 
 const (
-	FmtText  Format = designClipb.FmtText
-	FmtImage        = designClipb.FmtImage
+	FmtText  Format = clipboard.FmtText
+	FmtImage        = clipboard.FmtImage
 )

internal/clipboard/clipboard_default.go

@@ -1,11 +1,19 @@
-//go:build !linux
+//go:build !linux && !freebsd
 
 package clipboard
 
-import designClipb "golang.design/x/clipboard"
-
-var (
-	Init  = designClipb.Init
-	Read  = designClipb.Read
-	Write = designClipb.Write
+import (
+	"github.com/ayn2op/clipboard"
 )
+
+func Init() error {
+	return clipboard.Init()
+}
+
+func Read(t Format) ([]byte, error) {
+	return clipboard.Read(clipboard.Format(t))
+}
+
+func Write(t Format, buf []byte) error {
+	return clipboard.Write(clipboard.Format(t), buf)
+}

internal/clipboard/clipboard_linux.go internal/clipboard/clipboard_wayland.gointernal/clipboard/clipboard_linux.go renamed to internal/clipboard/clipboard_wayland.go

@@ -1,11 +1,10 @@
-//go:build linux
+//go:build linux || freebsd
 
 package clipboard
 
 import (
 	"bytes"
-	designClipb "golang.design/x/clipboard"
-	"log/slog"
+	"github.com/ayn2op/clipboard"
 	"os"
 	"os/exec"
 )
@@ -14,7 +13,7 @@ var wayland bool
 
 func Init() error {
 	if _, ok := os.LookupEnv("WAYLAND_DISPLAY"); !ok {
-		return designClipb.Init()
+		return clipboard.Init()
 	}
 	if _, err := exec.LookPath("wl-copy"); err != nil {
 		return err
@@ -26,33 +25,29 @@ func Init() error {
 	return nil
 }
 
-func Read(t Format) []byte {
+func Read(t Format) ([]byte, error) {
 	if !wayland {
-		return designClipb.Read(designClipb.Format(t))
+		return clipboard.Read(clipboard.Format(t))
 	}
 	// -n: Don't print a newline at the end
 	// -t type: MIME type specifier
 	cmd := exec.Command("wl-paste", "-nt", formatToType(t))
 	outBuffer := bytes.Buffer{}
 	cmd.Stdout = &outBuffer
 	if err := cmd.Run(); err != nil {
-		slog.Error("failed to read clipboard", "err", err)
-		return nil
+		return nil, err
 	}
-	return outBuffer.Bytes()
+	return outBuffer.Bytes(), nil
 }
 
-func Write(t Format, buf []byte) <-chan struct{} {
+func Write(t Format, buf []byte) error {
 	if !wayland {
-		return designClipb.Write(designClipb.Format(t), buf)
+		return clipboard.Write(clipboard.Format(t), buf)
 	}
 	// -t type: MIME type specifier
 	cmd := exec.Command("wl-copy", "-t", formatToType(t))
 	cmd.Stdin = bytes.NewReader(buf)
-	if err := cmd.Run(); err != nil {
-		slog.Error("failed to write to clipboard", "err", err)
-	}
-	return nil
+	return cmd.Run()
 }
 
 func formatToType(t Format) string {

internal/config/config.toml

@@ -169,7 +169,7 @@ down = "ctrl+n"
 top = "home"
 bottom = "end"
 
-# style = { foreground = "", background = "", attributes = "" or [""] }
+# style = { foreground = "", background = "", attributes = "" or ["",""],  underline = "", underline_color = "" }
 [theme.title]
 alignment = "left"                                           # `"left"`, `"center"`, or `"right"`.
 normal_style = { attributes = "dim" }
@@ -197,6 +197,15 @@ auto_expand_folders = true
 graphics = true
 graphics_color = "default"
 
+# Guilds tree indentation for different item types
+[theme.guilds_tree.indents]
+dm = 2
+group_dm = 1
+guild = 2      # server inside a folder
+category = 1
+channel = 2
+forum = 2
+
 [theme.scroll_bar]
 visibility = "auto"
 # "minimal", "box_drawing", or "unicode"
@@ -208,13 +217,23 @@ thumb_style = {}
 reply_indicator = ">"
 forwarded_indicator = "<"
 
-mention_style = { foreground = "blue" }
+mention_style = { foreground = "blue", attributes = "bold" }
 emoji_style = { foreground = "green" }
 url_style = { foreground = "blue" }
 attachment_style = { foreground = "yellow" }
 message_style = {}
 selected_message_style = { attributes = "reverse" }
 
+[theme.messages_list.embeds]
+provider_style = { attributes = ["dim", "italic"] }
+author_style = { attributes = "italic" }
+title_style = { foreground = "blue", attributes = "bold" }
+description_style = { attributes = "dim" }
+field_name_style = { attributes = ["bold", "underline"] }
+field_value_style = {}
+footer_style = { attributes = ["dim", "italic"] }
+url_style = { foreground = "blue", underline = "solid" }
+
 [theme.mentions_list]
 # Note: width and height are capped to the avaliable space
 # Minimum width