From e6c7f26fcdbdc63271e2d96091749e750da29de0 Mon Sep 17 00:00:00 2001
From: ayn2op <ayn2op@gmail.com>
Date: Fri, 19 Jun 2026 17:49:52 -0400
Subject: [PATCH] refactor: use forked arikawa and ningen

---
 cmd/root.go                             |  2 +-
 go.mod                                  | 14 ++++++--------
 go.sum                                  | 24 ++++++++++++------------
 internal/config/config.go               |  2 +-
 internal/http/client.go                 |  6 +++---
 internal/http/generator.go              |  2 +-
 internal/http/headers.go                |  2 +-
 internal/http/properties.go             |  4 ++--
 internal/markdown/renderer.go           |  2 +-
 internal/notifications/notifications.go |  6 +++---
 internal/ui/chat/channels_picker.go     |  2 +-
 internal/ui/chat/composer.go            | 14 +++++++-------
 internal/ui/chat/guilds_tree.go         |  6 +++---
 internal/ui/chat/messages_list.go       | 12 ++++++------
 internal/ui/chat/model.go               | 20 ++++++++++----------
 internal/ui/chat/msg.go                 |  2 +-
 internal/ui/chat/state.go               | 12 ++++++------
 internal/ui/login/qr/msg.go             |  2 +-
 internal/ui/util.go                     |  4 ++--
 19 files changed, 68 insertions(+), 70 deletions(-)

diff --git a/cmd/root.go b/cmd/root.go
index 2d77899..652be06 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"log/slog"
 
+	"github.com/ayn2op/arikawa/v3/utils/ws"
 	"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"
 )
 
diff --git a/go.mod b/go.mod
index 8d4abb2..0c4b705 100644
--- a/go.mod
+++ b/go.mod
@@ -4,17 +4,15 @@ 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.26.1
+	github.com/alecthomas/chroma/v2 v2.27.0
 	github.com/andybalholm/brotli v1.2.1
+	github.com/ayn2op/arikawa/v3 v3.0.0-20260619211231-9a7da0c518de
+	github.com/ayn2op/ningen/v3 v3.0.1-0.20260619214224-6a89f2062a83
 	github.com/ayn2op/tview v0.0.0-20260613222404-bc6acaaf92ef
 	github.com/deckarep/gosx-notifier v0.0.0-20180201035817-e127226297fb
-	github.com/diamondburned/arikawa/v3 v3.6.1-0.20260518050745-b430932b3ee1
-	github.com/diamondburned/ningen/v3 v3.0.1-0.20260306213430-5a08d3a709b4
-	github.com/gdamore/tcell/v3 v3.4.1-0.20260609012553-a1597cf05c72
+	github.com/gdamore/tcell/v3 v3.4.1-0.20260615224921-944dbd8c2c4f
 	github.com/gen2brain/beeep v0.11.2
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.6.0
@@ -37,7 +35,7 @@ require (
 	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
 	github.com/danieljoos/wincred v1.2.3 // indirect
 	github.com/dchest/jsmin v1.0.0 // indirect
-	github.com/dlclark/regexp2/v2 v2.2.1 // indirect
+	github.com/dlclark/regexp2/v2 v2.2.2 // indirect
 	github.com/ebitengine/purego v0.10.1 // indirect
 	github.com/esiqveland/notify v0.13.3 // indirect
 	github.com/gdamore/encoding v1.0.1 // indirect
@@ -57,7 +55,7 @@ require (
 	go4.org v0.0.0-20260112195520-a5071408f32f // indirect
 	golang.design/x/x11 v0.2.0 // indirect
 	golang.org/x/exp/shiny v0.0.0-20260611194520-c48552f49976 // indirect
-	golang.org/x/image v0.42.0 // indirect
+	golang.org/x/image v0.43.0 // indirect
 	golang.org/x/mobile v0.0.0-20260611195102-4dd8f1dbf5d2 // indirect
 	golang.org/x/sys v0.46.0 // indirect
 	golang.org/x/term v0.44.0 // indirect
diff --git a/go.sum b/go.sum
index dbf6437..4f9b07a 100644
--- a/go.sum
+++ b/go.sum
@@ -6,12 +6,16 @@ github.com/akavel/rsrc v0.10.2 h1:Zxm8V5eI1hW4gGaYsJQUhxpjkENuG91ki8B4zCrvEsw=
 github.com/akavel/rsrc v0.10.2/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
 github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
-github.com/alecthomas/chroma/v2 v2.26.1 h1:2X21EdxGZNv5GF9mG5u+uzc02GCFyGxbcBm3Grd9A78=
-github.com/alecthomas/chroma/v2 v2.26.1/go.mod h1:lxhRRa9H4hPmRLOOdYga4zkQIQjq3dtrrdwQeCfu78Y=
+github.com/alecthomas/chroma/v2 v2.27.0 h1:FodwmyOBgJULFYmDqibcp9pvfDLWdtPRh9v/r5BXYZs=
+github.com/alecthomas/chroma/v2 v2.27.0/go.mod h1:NjJ3ciIgrqBNeIkWZ4e46nseoLDslxU1LmfCoL+wcY8=
 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.1 h1:R+f5xP285VArJDRgowrfb9DqL18yVK0gKAW/F+eTWro=
 github.com/andybalholm/brotli v1.2.1/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
+github.com/ayn2op/arikawa/v3 v3.0.0-20260619211231-9a7da0c518de h1:j5qhTMT9t09g7R/8ndYTSSTpsTDQRbiHj/+iE5nx3Wc=
+github.com/ayn2op/arikawa/v3 v3.0.0-20260619211231-9a7da0c518de/go.mod h1:96vOKCn1rSdu7xJrCrKdwYzlgDZ5NmV9cMtPAeGHlGM=
+github.com/ayn2op/ningen/v3 v3.0.1-0.20260619214224-6a89f2062a83 h1:Dqap/VgsdiL0CNSBd+H845ZG5y2K3SJ8ji3F5oMTYIE=
+github.com/ayn2op/ningen/v3 v3.0.1-0.20260619214224-6a89f2062a83/go.mod h1:uMv/8i6wn0p4paqT2Tf1S4nn5dCoNIs4w1UWvODwvf0=
 github.com/ayn2op/tview v0.0.0-20260613222404-bc6acaaf92ef h1:25kloMP4wqA8h5MQBRrPQ9/8O8OzNn0y2fr9gIudFS0=
 github.com/ayn2op/tview v0.0.0-20260613222404-bc6acaaf92ef/go.mod h1:CaEiemJYKtmWqR0khyMI3HzVIia6B61jOPcLeZ7y4xk=
 github.com/clipperhouse/displaywidth v0.11.0 h1:lBc6kY44VFw+TDx4I8opi/EtL9m20WSEFgwIwO+UVM8=
@@ -27,20 +31,16 @@ 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.20260518050745-b430932b3ee1 h1:7nU4wRdBZjM8b8+uwV288wjcscG0mGWxTInUwQqrsUY=
-github.com/diamondburned/arikawa/v3 v3.6.1-0.20260518050745-b430932b3ee1/go.mod h1:uuswqjM/DPYde1GvGy3fdXvv3qYhR+7gIwnNN1C9EJI=
-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/v2 v2.2.1 h1:mf4KkFUj0gJuarK8P+LgiS+Lit7m9N1yAwEfPbee7R0=
-github.com/dlclark/regexp2/v2 v2.2.1/go.mod h1:avUrQvPaLz2DrFNHJF0taWAFFX2C1GMSSoeiqFjcBmU=
+github.com/dlclark/regexp2/v2 v2.2.2 h1:MYWvNYw8okuqNhwTYO587EZMiDruVa2vhV6fsGpfya0=
+github.com/dlclark/regexp2/v2 v2.2.2/go.mod h1:avUrQvPaLz2DrFNHJF0taWAFFX2C1GMSSoeiqFjcBmU=
 github.com/ebitengine/purego v0.10.1 h1:dewVBCBT2GaMu1SrNTYxQhgQBethzfhiwvZiLGP/qyY=
 github.com/ebitengine/purego v0.10.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/esiqveland/notify v0.13.3 h1:QCMw6o1n+6rl+oLUfg8P1IIDSFsDEb2WlXvVvIJbI/o=
 github.com/esiqveland/notify v0.13.3/go.mod h1:hesw/IRYTO0x99u1JPweAl4+5mwXJibQVUcP0Iu5ORE=
 github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw=
 github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo=
-github.com/gdamore/tcell/v3 v3.4.1-0.20260609012553-a1597cf05c72 h1:lhV2xUSTqrkhK9c9Cr+k+9pfEQ79ytgtQtTEwdgR8OI=
-github.com/gdamore/tcell/v3 v3.4.1-0.20260609012553-a1597cf05c72/go.mod h1:Ev/2PFhL0QtVmu6XPZG9NEuITAZ6XH7i7/BF3wupBdw=
+github.com/gdamore/tcell/v3 v3.4.1-0.20260615224921-944dbd8c2c4f h1:vEolmNXK3qWXRz2TJmjylUKA6Q9CbpM140Nvl8v++6Y=
+github.com/gdamore/tcell/v3 v3.4.1-0.20260615224921-944dbd8c2c4f/go.mod h1:Ev/2PFhL0QtVmu6XPZG9NEuITAZ6XH7i7/BF3wupBdw=
 github.com/gen2brain/beeep v0.11.2 h1:+KfiKQBbQCuhfJFPANZuJ+oxsSKAYNe88hIpJuyKWDA=
 github.com/gen2brain/beeep v0.11.2/go.mod h1:jQVvuwnLuwOcdctHn/uyh8horSBNJ8uGb9Cn2W4tvoc=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
@@ -123,8 +123,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp/shiny v0.0.0-20260611194520-c48552f49976 h1:xAKfctaZuXDxw/I98uYRl7TXMBy4a1BgPgl7NavbrdY=
 golang.org/x/exp/shiny v0.0.0-20260611194520-c48552f49976/go.mod h1:UXxgIHNj0uSRIk9ua62CRJcUpfHN9V+cRZRXHEo4GhE=
-golang.org/x/image v0.42.0 h1:1gSs6ehNWXLbkHBIPcWztk3D/6aIA/8hauiAYtlodVY=
-golang.org/x/image v0.42.0/go.mod h1:rrpelvGFt+kLPAjPM4HeWPgrl0FtafueU//e5N0qk/Q=
+golang.org/x/image v0.43.0 h1:FLxcP4ec2350nTfOC8ysKtqYSIFbk/QGjw1ZHNP4tsY=
+golang.org/x/image v0.43.0/go.mod h1:rrpelvGFt+kLPAjPM4HeWPgrl0FtafueU//e5N0qk/Q=
 golang.org/x/mobile v0.0.0-20260611195102-4dd8f1dbf5d2 h1:zoM1gIKhVkcQNm43kad8OHLgPNoJ12xIqmxHtKr8Mug=
 golang.org/x/mobile v0.0.0-20260611195102-4dd8f1dbf5d2/go.mod h1:QGMqsqLn6orFQ/ksqYMf+Fa33Soa1vPoHEd0Pj7N+lQ=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
diff --git a/internal/config/config.go b/internal/config/config.go
index c120a58..83b11eb 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -9,8 +9,8 @@ import (
 	"unicode/utf8"
 
 	"github.com/BurntSushi/toml"
+	"github.com/ayn2op/arikawa/v3/discord"
 	"github.com/ayn2op/discordo/internal/consts"
-	"github.com/diamondburned/arikawa/v3/discord"
 )
 
 const fileName = "config.toml"
diff --git a/internal/http/client.go b/internal/http/client.go
index 327141d..92aa24d 100644
--- a/internal/http/client.go
+++ b/internal/http/client.go
@@ -3,9 +3,9 @@ package http
 import (
 	"net/http"
 
-	"github.com/diamondburned/arikawa/v3/api"
-	"github.com/diamondburned/arikawa/v3/utils/httputil"
-	"github.com/diamondburned/arikawa/v3/utils/httputil/httpdriver"
+	"github.com/ayn2op/arikawa/v3/api"
+	"github.com/ayn2op/arikawa/v3/utils/httputil"
+	"github.com/ayn2op/arikawa/v3/utils/httputil/httpdriver"
 )
 
 func NewClient(token string) *api.Client {
diff --git a/internal/http/generator.go b/internal/http/generator.go
index da491ae..527de0e 100644
--- a/internal/http/generator.go
+++ b/internal/http/generator.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"regexp"
 
-	"github.com/diamondburned/arikawa/v3/api"
+	"github.com/ayn2op/arikawa/v3/api"
 )
 
 const format = `// GENERATED BY go generate; DO NOT EDIT.
diff --git a/internal/http/headers.go b/internal/http/headers.go
index e0cf469..ba6e46d 100644
--- a/internal/http/headers.go
+++ b/internal/http/headers.go
@@ -6,7 +6,7 @@ import (
 	"log/slog"
 	stdHttp "net/http"
 
-	"github.com/diamondburned/arikawa/v3/api"
+	"github.com/ayn2op/arikawa/v3/api"
 )
 
 func Headers() stdHttp.Header {
diff --git a/internal/http/properties.go b/internal/http/properties.go
index 10b5778..8e252f1 100644
--- a/internal/http/properties.go
+++ b/internal/http/properties.go
@@ -1,8 +1,8 @@
 package http
 
 import (
-	"github.com/diamondburned/arikawa/v3/discord"
-	"github.com/diamondburned/arikawa/v3/gateway"
+	"github.com/ayn2op/arikawa/v3/discord"
+	"github.com/ayn2op/arikawa/v3/gateway"
 	"github.com/google/uuid"
 )
 
diff --git a/internal/markdown/renderer.go b/internal/markdown/renderer.go
index 283c6b0..bb5fd34 100644
--- a/internal/markdown/renderer.go
+++ b/internal/markdown/renderer.go
@@ -8,8 +8,8 @@ import (
 	"github.com/alecthomas/chroma/v2/lexers"
 	"github.com/alecthomas/chroma/v2/styles"
 	"github.com/ayn2op/discordo/internal/config"
+	"github.com/ayn2op/ningen/v3/discordmd"
 	"github.com/ayn2op/tview"
-	"github.com/diamondburned/ningen/v3/discordmd"
 	"github.com/gdamore/tcell/v3"
 	"github.com/yuin/goldmark/ast"
 )
diff --git a/internal/notifications/notifications.go b/internal/notifications/notifications.go
index e1186e3..f7dfb8c 100644
--- a/internal/notifications/notifications.go
+++ b/internal/notifications/notifications.go
@@ -8,11 +8,11 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/ayn2op/arikawa/v3/discord"
+	"github.com/ayn2op/arikawa/v3/gateway"
 	"github.com/ayn2op/discordo/internal/config"
 	"github.com/ayn2op/discordo/internal/consts"
-	"github.com/diamondburned/arikawa/v3/discord"
-	"github.com/diamondburned/arikawa/v3/gateway"
-	"github.com/diamondburned/ningen/v3"
+	"github.com/ayn2op/ningen/v3"
 )
 
 func Notify(state *ningen.State, message gateway.MessageCreateEvent, cfg *config.Config) error {
diff --git a/internal/ui/chat/channels_picker.go b/internal/ui/chat/channels_picker.go
index ecf3d59..6ef0d8e 100644
--- a/internal/ui/chat/channels_picker.go
+++ b/internal/ui/chat/channels_picker.go
@@ -4,13 +4,13 @@ import (
 	"log/slog"
 	"strings"
 
+	"github.com/ayn2op/arikawa/v3/discord"
 	"github.com/ayn2op/discordo/internal/config"
 	"github.com/ayn2op/discordo/internal/ui"
 	"github.com/ayn2op/tview"
 	"github.com/ayn2op/tview/help"
 	"github.com/ayn2op/tview/keybind"
 	"github.com/ayn2op/tview/picker"
-	"github.com/diamondburned/arikawa/v3/discord"
 )
 
 type channelsPicker struct {
diff --git a/internal/ui/chat/composer.go b/internal/ui/chat/composer.go
index a4979e7..7888c18 100644
--- a/internal/ui/chat/composer.go
+++ b/internal/ui/chat/composer.go
@@ -13,20 +13,20 @@ import (
 	"time"
 	"unicode"
 
+	"github.com/ayn2op/arikawa/v3/api"
+	"github.com/ayn2op/arikawa/v3/discord"
+	"github.com/ayn2op/arikawa/v3/state"
+	"github.com/ayn2op/arikawa/v3/utils/json/option"
+	"github.com/ayn2op/arikawa/v3/utils/sendpart"
 	"github.com/ayn2op/discordo/internal/cache"
 	"github.com/ayn2op/discordo/internal/config"
 	"github.com/ayn2op/discordo/internal/consts"
 	"github.com/ayn2op/discordo/internal/ui"
+	"github.com/ayn2op/ningen/v3"
+	"github.com/ayn2op/ningen/v3/discordmd"
 	"github.com/ayn2op/tview"
 	"github.com/ayn2op/tview/help"
 	"github.com/ayn2op/tview/keybind"
-	"github.com/diamondburned/arikawa/v3/api"
-	"github.com/diamondburned/arikawa/v3/discord"
-	"github.com/diamondburned/arikawa/v3/state"
-	"github.com/diamondburned/arikawa/v3/utils/json/option"
-	"github.com/diamondburned/arikawa/v3/utils/sendpart"
-	"github.com/diamondburned/ningen/v3"
-	"github.com/diamondburned/ningen/v3/discordmd"
 	"github.com/gdamore/tcell/v3"
 	"github.com/ncruces/zenity"
 	"github.com/sahilm/fuzzy"
diff --git a/internal/ui/chat/guilds_tree.go b/internal/ui/chat/guilds_tree.go
index 8c911a4..e4ce389 100644
--- a/internal/ui/chat/guilds_tree.go
+++ b/internal/ui/chat/guilds_tree.go
@@ -4,15 +4,15 @@ import (
 	"fmt"
 	"log/slog"
 
+	"github.com/ayn2op/arikawa/v3/discord"
+	"github.com/ayn2op/arikawa/v3/gateway"
 	"github.com/ayn2op/discordo/internal/config"
 	"github.com/ayn2op/discordo/internal/ui"
+	"github.com/ayn2op/ningen/v3"
 	"github.com/ayn2op/tview"
 	"github.com/ayn2op/tview/help"
 	"github.com/ayn2op/tview/keybind"
 	"github.com/ayn2op/tview/tree"
-	"github.com/diamondburned/arikawa/v3/discord"
-	"github.com/diamondburned/arikawa/v3/gateway"
-	"github.com/diamondburned/ningen/v3"
 	"github.com/gdamore/tcell/v3"
 	"golang.design/x/clipboard"
 )
diff --git a/internal/ui/chat/messages_list.go b/internal/ui/chat/messages_list.go
index 1fc4e43..c8f4ce7 100644
--- a/internal/ui/chat/messages_list.go
+++ b/internal/ui/chat/messages_list.go
@@ -16,20 +16,20 @@ import (
 
 	"github.com/ayn2op/tview/layers"
 
+	"github.com/ayn2op/arikawa/v3/api"
+	"github.com/ayn2op/arikawa/v3/discord"
+	"github.com/ayn2op/arikawa/v3/gateway"
+	"github.com/ayn2op/arikawa/v3/state"
+	"github.com/ayn2op/arikawa/v3/utils/json/option"
 	"github.com/ayn2op/discordo/internal/config"
 	"github.com/ayn2op/discordo/internal/consts"
 	"github.com/ayn2op/discordo/internal/markdown"
 	"github.com/ayn2op/discordo/internal/ui"
+	"github.com/ayn2op/ningen/v3/discordmd"
 	"github.com/ayn2op/tview"
 	"github.com/ayn2op/tview/help"
 	"github.com/ayn2op/tview/keybind"
 	"github.com/ayn2op/tview/list"
-	"github.com/diamondburned/arikawa/v3/api"
-	"github.com/diamondburned/arikawa/v3/discord"
-	"github.com/diamondburned/arikawa/v3/gateway"
-	"github.com/diamondburned/arikawa/v3/state"
-	"github.com/diamondburned/arikawa/v3/utils/json/option"
-	"github.com/diamondburned/ningen/v3/discordmd"
 	"github.com/gdamore/tcell/v3"
 	"github.com/gdamore/tcell/v3/color"
 	"github.com/rivo/uniseg"
diff --git a/internal/ui/chat/model.go b/internal/ui/chat/model.go
index 414c825..b2a80dd 100644
--- a/internal/ui/chat/model.go
+++ b/internal/ui/chat/model.go
@@ -6,23 +6,23 @@ import (
 	"sync"
 	"time"
 
+	"github.com/ayn2op/arikawa/v3/discord"
+	"github.com/ayn2op/arikawa/v3/gateway"
+	"github.com/ayn2op/arikawa/v3/session"
+	"github.com/ayn2op/arikawa/v3/state"
+	"github.com/ayn2op/arikawa/v3/state/store/defaultstore"
+	"github.com/ayn2op/arikawa/v3/utils/handler"
+	"github.com/ayn2op/arikawa/v3/utils/httputil"
+	"github.com/ayn2op/arikawa/v3/utils/ws"
 	"github.com/ayn2op/discordo/internal/config"
 	"github.com/ayn2op/discordo/internal/http"
 	"github.com/ayn2op/discordo/internal/ui"
+	"github.com/ayn2op/ningen/v3"
+	"github.com/ayn2op/ningen/v3/states/read"
 	"github.com/ayn2op/tview"
 	"github.com/ayn2op/tview/flex"
 	"github.com/ayn2op/tview/keybind"
 	"github.com/ayn2op/tview/layers"
-	"github.com/diamondburned/arikawa/v3/discord"
-	"github.com/diamondburned/arikawa/v3/gateway"
-	"github.com/diamondburned/arikawa/v3/session"
-	"github.com/diamondburned/arikawa/v3/state"
-	"github.com/diamondburned/arikawa/v3/state/store/defaultstore"
-	"github.com/diamondburned/arikawa/v3/utils/handler"
-	"github.com/diamondburned/arikawa/v3/utils/httputil"
-	"github.com/diamondburned/arikawa/v3/utils/ws"
-	"github.com/diamondburned/ningen/v3"
-	"github.com/diamondburned/ningen/v3/states/read"
 	"github.com/gdamore/tcell/v3"
 )
 
diff --git a/internal/ui/chat/msg.go b/internal/ui/chat/msg.go
index 2013e1e..df96f47 100644
--- a/internal/ui/chat/msg.go
+++ b/internal/ui/chat/msg.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"log/slog"
 
+	"github.com/ayn2op/arikawa/v3/discord"
 	"github.com/ayn2op/tview"
-	"github.com/diamondburned/arikawa/v3/discord"
 )
 
 func (m *Model) openState() tview.Cmd {
diff --git a/internal/ui/chat/state.go b/internal/ui/chat/state.go
index cd7a364..5c6fdb7 100644
--- a/internal/ui/chat/state.go
+++ b/internal/ui/chat/state.go
@@ -4,15 +4,15 @@ import (
 	"log/slog"
 	"slices"
 
+	"github.com/ayn2op/arikawa/v3/discord"
+	"github.com/ayn2op/arikawa/v3/gateway"
+	"github.com/ayn2op/arikawa/v3/utils/httputil/httpdriver"
+	"github.com/ayn2op/arikawa/v3/utils/ws"
 	"github.com/ayn2op/discordo/internal/notifications"
+	"github.com/ayn2op/ningen/v3"
+	"github.com/ayn2op/ningen/v3/states/read"
 	"github.com/ayn2op/tview"
 	"github.com/ayn2op/tview/tree"
-	"github.com/diamondburned/arikawa/v3/discord"
-	"github.com/diamondburned/arikawa/v3/gateway"
-	"github.com/diamondburned/arikawa/v3/utils/httputil/httpdriver"
-	"github.com/diamondburned/arikawa/v3/utils/ws"
-	"github.com/diamondburned/ningen/v3"
-	"github.com/diamondburned/ningen/v3/states/read"
 )
 
 func (m *Model) onRequest(r httpdriver.Request) error {
diff --git a/internal/ui/login/qr/msg.go b/internal/ui/login/qr/msg.go
index a78acef..4eae565 100644
--- a/internal/ui/login/qr/msg.go
+++ b/internal/ui/login/qr/msg.go
@@ -11,9 +11,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ayn2op/arikawa/v3/utils/httputil"
 	"github.com/ayn2op/discordo/internal/http"
 	"github.com/ayn2op/tview"
-	"github.com/diamondburned/arikawa/v3/utils/httputil"
 	"github.com/gorilla/websocket"
 	"github.com/skip2/go-qrcode"
 )
diff --git a/internal/ui/util.go b/internal/ui/util.go
index a6633af..29bd85c 100644
--- a/internal/ui/util.go
+++ b/internal/ui/util.go
@@ -5,10 +5,10 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/ayn2op/arikawa/v3/discord"
 	"github.com/ayn2op/discordo/internal/config"
+	"github.com/ayn2op/ningen/v3"
 	"github.com/ayn2op/tview"
-	"github.com/diamondburned/arikawa/v3/discord"
-	"github.com/diamondburned/ningen/v3"
 )
 
 // ConfigureBox configures the provided box according to the provided theme.