From d984d087a2e451c25e4de15ed39e858c8f5e64cc Mon Sep 17 00:00:00 2001 From: ayntgl Date: Tue, 25 Jan 2022 20:57:40 +0400 Subject: [PATCH] refactor: remove notifications feature --- go.mod | 6 ------ go.sum | 13 ------------- ui/app.go | 32 +++++++------------------------- util/config.go | 2 -- 4 files changed, 7 insertions(+), 46 deletions(-) diff --git a/go.mod b/go.mod index 3d22315..095fe8e 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ require ( github.com/atotto/clipboard v0.1.4 github.com/ayntgl/discordgo v0.23.3-0.20220124081725-decdb6a611b6 github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1 - github.com/gen2brain/beeep v0.0.0-20210529141713-5586760f0cc1 github.com/rivo/tview v0.0.0-20220106183741-90d72bc664f5 github.com/zalando/go-keyring v0.1.1 ) @@ -15,16 +14,11 @@ require ( require ( github.com/danieljoos/wincred v1.1.0 // indirect github.com/gdamore/encoding v1.0.0 // indirect - github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 // indirect github.com/godbus/dbus/v5 v5.0.3 // indirect - github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c // indirect - github.com/gopherjs/gopherwasm v1.1.0 // indirect github.com/gorilla/websocket v1.4.2 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/mattn/go-runewidth v0.0.13 // indirect - github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect github.com/rivo/uniseg v0.2.0 // indirect - github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect diff --git a/go.sum b/go.sum index 8014d9e..a9f0b3a 100644 --- a/go.sum +++ b/go.sum @@ -12,24 +12,14 @@ github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdk github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1 h1:QqwPZCwh/k1uYqq6uXSb9TRDhTkfQbO80v8zhnIe5zM= github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1/go.mod h1:Az6Jt+M5idSED2YPGtwnfJV0kXohgdCBPmHGSYc1r04= -github.com/gen2brain/beeep v0.0.0-20210529141713-5586760f0cc1 h1:Xh9mvwEmhbdXlRSsgn+N0zj/NqnKvpeqL08oKDHln2s= -github.com/gen2brain/beeep v0.0.0-20210529141713-5586760f0cc1/go.mod h1:ElSskYZe3oM8kThaHGJ+kiN2yyUMVXMZ7WxF9QqLDS8= -github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 h1:qZNfIGkIANxGv/OqtnntR4DfOY2+BgwR60cAcu/i3SE= -github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4/go.mod h1:kW3HQ4UdaAyrUCSSDR4xUzBKW6O2iA4uHhk7AtyYp10= github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c h1:16eHWuMGvCjSfgRJKqIzapE78onvvTbdi1rMkU00lZw= -github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherwasm v1.1.0 h1:fA2uLoctU5+T3OhOn2vYP0DVT6pxc7xhTlBB1paATqQ= -github.com/gopherjs/gopherwasm v1.1.0/go.mod h1:SkZ8z7CWBz5VXbhJel8TxCmAcsQqzgWGR/8nMhyhZSI= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ= -github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rivo/tview v0.0.0-20220106183741-90d72bc664f5 h1:n0qwaaNXgplKv5AeDIzpXnwoLh9ddQzVsAY8d7WiZvs= @@ -40,14 +30,11 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af h1:6yITBqGTE2lEeTPG04SN9W+iWHCRyHqlVYILiSXziwk= -github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af/go.mod h1:4F09kP5F+am0jAwlQLddpoMDM+iewkxxt6nxUQ5nq5o= github.com/zalando/go-keyring v0.1.1 h1:w2V9lcx/Uj4l+dzAf1m9s+DJ1O8ROkEHnynonHjTcYE= github.com/zalando/go-keyring v0.1.1/go.mod h1:OIC+OZ28XbmwFxU/Rp9V7eKzZjamBJwRzC8UFJH9+L8= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY= golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/ui/app.go b/ui/app.go index 47dbb05..c62e54e 100644 --- a/ui/app.go +++ b/ui/app.go @@ -1,13 +1,11 @@ package ui import ( - "fmt" "sort" "strings" "github.com/ayntgl/discordgo" "github.com/ayntgl/discordo/util" - "github.com/gen2brain/beeep" "github.com/rivo/tview" ) @@ -91,30 +89,14 @@ func (app *App) onGuildCreate(_ *discordgo.Session, g *discordgo.GuildCreate) { } func (app *App) onSessionMessageCreate(_ *discordgo.Session, m *discordgo.MessageCreate) { - if app.SelectedChannel == nil || app.SelectedChannel.ID != m.ChannelID { - if app.Config.General.Notifications { - for _, u := range m.Mentions { - if u.ID == app.Session.State.User.ID { - g, err := app.Session.State.Guild(m.GuildID) - if err != nil { - return - } + if app.SelectedChannel == nil { + return + } - c, err := app.Session.State.Channel(m.ChannelID) - if err != nil { - return - } + app.SelectedChannel.Messages = append(app.SelectedChannel.Messages, m.Message) + app.MessagesTextView.Write(buildMessage(app, m.Message)) - go beeep.Alert(fmt.Sprintf("%s (#%s)", g.Name, c.Name), m.ContentWithMentionsReplaced(), "") - } - } - } - } else { - app.SelectedChannel.Messages = append(app.SelectedChannel.Messages, m.Message) - app.MessagesTextView.Write(buildMessage(app, m.Message)) - - if len(app.MessagesTextView.GetHighlights()) == 0 { - app.MessagesTextView.ScrollToEnd() - } + if len(app.MessagesTextView.GetHighlights()) == 0 { + app.MessagesTextView.ScrollToEnd() } } diff --git a/util/config.go b/util/config.go index db07921..5e56534 100644 --- a/util/config.go +++ b/util/config.go @@ -10,7 +10,6 @@ type GeneralConfig struct { UserAgent string `toml:"user_agent"` FetchMessagesLimit int `toml:"fetch_messages_limit"` Mouse bool `toml:"mouse"` - Notifications bool `toml:"notifications"` Timestamps bool `toml:"timestamps"` } @@ -70,7 +69,6 @@ func newDefaultConfig() Config { UserAgent: "Mozilla/5.0 (X11; Linux x86_64; rv:95.0) Gecko/20100101 Firefox/95.0", FetchMessagesLimit: 50, Mouse: true, - Notifications: true, Timestamps: false, }, Keybindings: KeybindingsConfig{