Thumbnail

rani/matterbridge.git

Clone URL: https://git.buni.party/rani/matterbridge.git

commit dce27cf2d190de37d62411c33a77a5502839e4be Author: Wim <wim@42.be> Date: Tue Feb 26 17:21:23 2019 +0000 Print errors as string instead of %#v (#738) diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go index bc33796..49dfe4b 100644 --- a/bridge/discord/discord.go +++ b/bridge/discord/discord.go @@ -2467 +2467 @@ func (b *Bdiscord) Send(msg config.Message) (string, error) {   b.Log.Debugf("Setting webhook channel to \"%s\"", msg.Channel)   _, err := b.c.WebhookEdit(wID, "", "", channelID)   if err != nil { - b.Log.Errorf("Could not set webhook channel: %v", err) + b.Log.Errorf("Could not set webhook channel: %s", err)   return "", err   }   } @@ -2787 +2787 @@ func (b *Bdiscord) Send(msg config.Message) (string, error) {   for _, rmsg := range helper.HandleExtra(&msg, b.General) {   rmsg.Text = helper.ClipMessage(rmsg.Text, MessageLength)   if _, err := b.c.ChannelMessageSend(channelID, rmsg.Username+rmsg.Text); err != nil { - b.Log.Errorf("Could not send message %#v: %v", rmsg, err) + b.Log.Errorf("Could not send message %#v: %s", rmsg, err)   }   }   // check if we have files to upload (from slack, telegram or mattermost) @@ -3607 +3607 @@ func (b *Bdiscord) handleUploadFile(msg *config.Message, channelID string) (stri   }   _, err = b.c.ChannelMessageSendComplex(channelID, &m)   if err != nil { - return "", fmt.Errorf("file upload failed: %#v", err) + return "", fmt.Errorf("file upload failed: %s", err)   }   }   return "", nil diff --git a/bridge/discord/helpers.go b/bridge/discord/helpers.go index e693498..7b06081 100644 --- a/bridge/discord/helpers.go +++ b/bridge/discord/helpers.go @@ -257 +257 @@ func (b *Bdiscord) getNick(user *discordgo.User) string {   // If we didn't find nick, search for it.   member, err := b.c.GuildMember(b.guildID, user.ID)   if err != nil { - b.Log.Warnf("Failed to fetch information for member %#v: %#v", user, err) + b.Log.Warnf("Failed to fetch information for member %#v: %s", user, err)   return user.Username   } else if member == nil {   b.Log.Warnf("Got no information for member %#v", user)