From 815d8b804fee54d279f74b741da8467350cf9842 Mon Sep 17 00:00:00 2001 From: Wim Date: Fri, 24 May 2024 00:23:50 +0200 Subject: [PATCH] Fix linting --- bridge/discord/discord.go | 4 ++-- bridge/discord/webhook.go | 20 ++++++++++---------- bridge/helper/helper.go | 8 ++++---- bridge/helper/helper_test.go | 12 ++++++------ 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go index 2707ad20..3f99da0c 100644 --- a/bridge/discord/discord.go +++ b/bridge/discord/discord.go @@ -331,7 +331,7 @@ func (b *Bdiscord) handleEventBotUser(msg *config.Message, channelID string) (st // Edit message if msg.ID != "" { // Exploit that a discord message ID is actually just a large number, and we encode a list of IDs by separating them with ";". - var msgIds = strings.Split(msg.ID, ";") + msgIds := strings.Split(msg.ID, ";") msgParts := helper.ClipOrSplitMessage(b.replaceUserMentions(msg.Text), MessageLength, b.GetString("MessageClipped"), len(msgIds)) for len(msgParts) < len(msgIds) { msgParts = append(msgParts, "((obsoleted by edit))") @@ -349,7 +349,7 @@ func (b *Bdiscord) handleEventBotUser(msg *config.Message, channelID string) (st } msgParts := helper.ClipOrSplitMessage(b.replaceUserMentions(msg.Text), MessageLength, b.GetString("MessageClipped"), b.GetInt("MessageSplitMaxCount")) - var msgIds = []string{} + msgIds := []string{} for _, msgPart := range msgParts { m := discordgo.MessageSend{ diff --git a/bridge/discord/webhook.go b/bridge/discord/webhook.go index 4e647b38..74a272b0 100644 --- a/bridge/discord/webhook.go +++ b/bridge/discord/webhook.go @@ -45,7 +45,7 @@ func (b *Bdiscord) maybeGetLocalAvatar(msg *config.Message) string { func (b *Bdiscord) webhookSendTextOnly(msg *config.Message, channelID string) (string, error) { msgParts := helper.ClipOrSplitMessage(msg.Text, MessageLength, b.GetString("MessageClipped"), b.GetInt("MessageSplitMaxCount")) - var msgIds = []string{} + msgIds := []string{} for _, msgPart := range msgParts { res, err := b.transmitter.Send( channelID, @@ -68,7 +68,7 @@ func (b *Bdiscord) webhookSendTextOnly(msg *config.Message, channelID string) (s func (b *Bdiscord) webhookSendFilesOnly(msg *config.Message, channelID string) error { for _, f := range msg.Extra["file"] { - fi := f.(config.FileInfo) + fi := f.(config.FileInfo) //nolint:forcetypeassert file := discordgo.File{ Name: fi.Name, ContentType: "", @@ -101,8 +101,8 @@ func (b *Bdiscord) webhookSendFilesOnly(msg *config.Message, channelID string) e // Returns messageID and error. func (b *Bdiscord) webhookSend(msg *config.Message, channelID string) (string, error) { var ( - res string - err error + res string + err error ) // If avatar is unset, mutate the message to include the local avatar (but only if settings say we should do this) @@ -143,29 +143,29 @@ func (b *Bdiscord) handleEventWebhook(msg *config.Message, channelID string) (st if msg.ID != "" { // Exploit that a discord message ID is actually just a large number, and we encode a list of IDs by separating them with ";". - var msgIds = strings.Split(msg.ID, ";") + msgIds := strings.Split(msg.ID, ";") msgParts := helper.ClipOrSplitMessage(b.replaceUserMentions(msg.Text), MessageLength, b.GetString("MessageClipped"), len(msgIds)) for len(msgParts) < len(msgIds) { msgParts = append(msgParts, "((obsoleted by edit))") } b.Log.Debugf("Editing webhook message") - var edit_err error = nil + var editErr error = nil for i := range msgParts { // In case of split-messages where some parts remain the same (i.e. only a typo-fix in a huge message), this causes some noop-updates. // TODO: Optimize away noop-updates of un-edited messages - edit_err = b.transmitter.Edit(channelID, msgIds[i], &discordgo.WebhookParams{ + editErr = b.transmitter.Edit(channelID, msgIds[i], &discordgo.WebhookParams{ Content: msgParts[i], Username: msg.Username, AllowedMentions: b.getAllowedMentions(), }) - if edit_err != nil { + if editErr != nil { break } } - if edit_err == nil { + if editErr == nil { return msg.ID, nil } - b.Log.Errorf("Could not edit webhook message(s): %s; sending as new message(s) instead", edit_err) + b.Log.Errorf("Could not edit webhook message(s): %s; sending as new message(s) instead", editErr) } b.Log.Debugf("Processing webhook sending for message %#v", msg) diff --git a/bridge/helper/helper.go b/bridge/helper/helper.go index d968f4d8..b90c9065 100644 --- a/bridge/helper/helper.go +++ b/bridge/helper/helper.go @@ -231,17 +231,17 @@ func ClipMessage(text string, length int, clippingMessage string) string { func ClipOrSplitMessage(text string, length int, clippingMessage string, splitMax int) []string { var msgParts []string - var remainingText = text + remainingText := text // Invariant of this splitting loop: No text is lost (msgParts+remainingText is the original text), // and all parts is guaranteed to satisfy the length requirement. - for len(msgParts) < splitMax - 1 && len(remainingText) > length { + for len(msgParts) < splitMax-1 && len(remainingText) > length { // Decision: The text needs to be split (again). var chunk string - var wasted = 0 + wasted := 0 // The longest UTF-8 encoding of a valid rune is 4 bytes (0xF4 0x8F 0xBF 0xBF, encoding U+10FFFF), // so we should never need to waste 4 or more bytes at a time. for wasted < 4 && wasted < length { - chunk = remainingText[:length - wasted] + chunk = remainingText[:length-wasted] if r, _ := utf8.DecodeLastRuneInString(chunk); r == utf8.RuneError { wasted += 1 } else { diff --git a/bridge/helper/helper_test.go b/bridge/helper/helper_test.go index 739ece9a..6823de6b 100644 --- a/bridge/helper/helper_test.go +++ b/bridge/helper/helper_test.go @@ -169,7 +169,7 @@ var clippingOrSplittingTestCases = map[string]struct { clipSplitLength: 50, clippingMessage: "?!?!", splitMax: 10, - expectedOutput: []string{ + expectedOutput: []string{ "Lorem ipsum dolor sit amet, consectetur adipiscing", " elit, sed do eiusmod tempor incididunt ut labore ", "et dolore magna aliqua.", @@ -180,7 +180,7 @@ var clippingOrSplittingTestCases = map[string]struct { clipSplitLength: 50, clippingMessage: "?!?!", splitMax: 3, - expectedOutput: []string{ + expectedOutput: []string{ "Lorem ipsum dolor sit amet, consectetur adipiscing", " elit, sed do eiusmod tempor incididunt ut labore ", "et dolore magna aliqua.", @@ -191,7 +191,7 @@ var clippingOrSplittingTestCases = map[string]struct { clipSplitLength: 50, clippingMessage: "?!?!", splitMax: 2, - expectedOutput: []string{ + expectedOutput: []string{ "Lorem ipsum dolor sit amet, consectetur adipiscing", " elit, sed do eiusmod tempor incididunt ut lab?!?!", }, @@ -201,7 +201,7 @@ var clippingOrSplittingTestCases = map[string]struct { clipSplitLength: 50, clippingMessage: "", splitMax: 2, - expectedOutput: []string{ + expectedOutput: []string{ "Lorem ipsum dolor sit amet, consectetur adipiscing", " elit, sed do eiusmod tempor inc ", }, @@ -218,8 +218,8 @@ var clippingOrSplittingTestCases = map[string]struct { clipSplitLength: 50, clippingMessage: "", splitMax: 10, - expectedOutput: []string{ - "人人生而自由，在尊嚴和權利上一律", // Note: only 48 bytes! + expectedOutput: []string{ + "人人生而自由，在尊嚴和權利上一律", // Note: only 48 bytes! "平等。 他們都具有理性和良知，應該", // Note: only 49 bytes! "以兄弟情誼的精神對待彼此。", },