From 14970d0e05ebc4aa47d7618a7dfa819aa96791db Mon Sep 17 00:00:00 2001 From: diamondburned Date: Sat, 2 Jan 2021 20:44:30 -0800 Subject: [PATCH] minor bug fixes --- .../channel/message/send/complete/completer.go | 2 +- .../channel/message/send/complete/emoji.go | 2 +- .../channel/message/send/complete/mention.go | 9 +++++---- internal/discord/message/message.go | 6 +----- internal/discord/session/session.go | 3 +-- internal/segments/emoji/emoji.go | 16 +++------------- 6 files changed, 12 insertions(+), 26 deletions(-) diff --git a/internal/discord/channel/message/send/complete/completer.go b/internal/discord/channel/message/send/complete/completer.go index a40270f..7a2495e 100644 --- a/internal/discord/channel/message/send/complete/completer.go +++ b/internal/discord/channel/message/send/complete/completer.go @@ -21,7 +21,7 @@ type Completer struct { SlashHandler cchat.Completer } -const MaxCompletion = 15 +const MaxCompletion = 50 func New(ch shared.Channel) cchat.Completer { completer := ChannelCompleter{ch} diff --git a/internal/discord/channel/message/send/complete/emoji.go b/internal/discord/channel/message/send/complete/emoji.go index 5e0f0a4..f67bfa8 100644 --- a/internal/discord/channel/message/send/complete/emoji.go +++ b/internal/discord/channel/message/send/complete/emoji.go @@ -44,7 +44,7 @@ GuildSearch: Raw: raw, Text: text.Rich{Content: ":" + emoji.Name + ":"}, Secondary: text.Rich{Content: guild.Name}, - IconURL: urlutils.Sized(emoji.EmojiURL(), 32), // small + IconURL: urlutils.Sized(emoji.EmojiURL(), 64), Image: true, }) diff --git a/internal/discord/channel/message/send/complete/mention.go b/internal/discord/channel/message/send/complete/mention.go index 74cf417..52a41d0 100644 --- a/internal/discord/channel/message/send/complete/mention.go +++ b/internal/discord/channel/message/send/complete/mention.go @@ -6,6 +6,7 @@ import ( "github.com/diamondburned/cchat" "github.com/diamondburned/cchat-discord/internal/discord/message" "github.com/diamondburned/cchat-discord/internal/discord/state" + "github.com/diamondburned/cchat-discord/internal/urlutils" "github.com/diamondburned/cchat/text" ) @@ -108,7 +109,7 @@ func AllUsers(s *state.Instance, word string) []cchat.CompletionEntry { Raw: raw, Text: text.Plain(r.User.Username + "#" + r.User.Discriminator), Secondary: text.Plain(FormatStatus(status) + " - " + FormatRelationshipType(r.Type)), - IconURL: r.User.AvatarURL(), + IconURL: urlutils.AvatarURL(r.User.AvatarURL()), }) distances[raw] = rank @@ -142,7 +143,7 @@ func AllUsers(s *state.Instance, word string) []cchat.CompletionEntry { Raw: raw, Text: text.Plain(p.User.Username + "#" + p.User.Discriminator), Secondary: text.Plain(FormatStatus(p.Status)), - IconURL: p.User.AvatarURL(), + IconURL: urlutils.AvatarURL(p.User.AvatarURL()), }) distances[raw] = rank @@ -222,7 +223,7 @@ func (ch ChannelCompleter) CompleteMentions(word string) []cchat.CompletionEntry Raw: raw, Text: text.Rich{Content: u.Username}, Secondary: text.Rich{Content: u.Username + "#" + u.Discriminator}, - IconURL: u.AvatarURL(), + IconURL: urlutils.AvatarURL(u.AvatarURL()), }) distances[raw] = rank @@ -266,7 +267,7 @@ func (ch ChannelCompleter) CompleteMentions(word string) []cchat.CompletionEntry Raw: raw, Text: message.RenderMemberName(mem, *g, ch.State), Secondary: text.Plain(mem.User.Username + "#" + mem.User.Discriminator), - IconURL: mem.User.AvatarURL(), + IconURL: urlutils.AvatarURL(mem.User.AvatarURL()), }) distances[raw] = rank diff --git a/internal/discord/message/message.go b/internal/discord/message/message.go index f038df7..353266a 100644 --- a/internal/discord/message/message.go +++ b/internal/discord/message/message.go @@ -25,16 +25,12 @@ type messageHeader struct { var _ cchat.MessageHeader = (*messageHeader)(nil) func newHeader(msg discord.Message) messageHeader { - var h = messageHeader{ + return messageHeader{ id: msg.ID, time: msg.Timestamp, channelID: msg.ChannelID, guildID: msg.GuildID, } - if msg.EditedTimestamp.IsValid() { - h.time = msg.EditedTimestamp - } - return h } func newHeaderNonce(msg discord.Message, nonce string) messageHeader { diff --git a/internal/discord/session/session.go b/internal/discord/session/session.go index fe38adb..ccd1183 100644 --- a/internal/discord/session/session.go +++ b/internal/discord/session/session.go @@ -2,7 +2,6 @@ package session import ( "context" - "log" "github.com/diamondburned/arikawa/v2/gateway" "github.com/diamondburned/arikawa/v2/session" @@ -85,7 +84,7 @@ func (s *Session) Servers(container cchat.ServersContainer) error { // Set the entire container again once reconnected. s.state.AddHandler(func(*ningen.Connected) { - log.Println("[Discord] ningen.Connected received, error:", s.servers(container)) + s.servers(container) }) return s.servers(container) diff --git a/internal/segments/emoji/emoji.go b/internal/segments/emoji/emoji.go index 09c2772..2e58de0 100644 --- a/internal/segments/emoji/emoji.go +++ b/internal/segments/emoji/emoji.go @@ -1,10 +1,9 @@ package emoji import ( - "net/url" - "github.com/diamondburned/arikawa/v2/discord" "github.com/diamondburned/cchat-discord/internal/segments/renderer" + "github.com/diamondburned/cchat-discord/internal/urlutils" "github.com/diamondburned/cchat/text" "github.com/diamondburned/cchat/utils/empty" "github.com/diamondburned/ningen/v2/md" @@ -42,16 +41,7 @@ type Emoji struct { var _ text.Imager = (*Emoji)(nil) func injectSizeURL(fullURL string) string { - u, err := url.Parse(fullURL) - if err != nil { - return fullURL - } - - v := u.Query() - v.Set("size", "64") - - u.RawQuery = v.Encode() - return u.String() + return urlutils.Sized(fullURL, 64) } func EmojiFromNode(n *md.Emoji) Emoji { @@ -65,8 +55,8 @@ func EmojiFromNode(n *md.Emoji) Emoji { func EmojiFromDiscord(e discord.Emoji, large bool) Emoji { return Emoji{ Name: e.Name, - EmojiURL: injectSizeURL(e.EmojiURL()), Large: large, + EmojiURL: injectSizeURL(e.EmojiURL()), } }