Thumbnail

rani/matterbridge.git

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

Info Tree Commits Branches Tags Show Grep
commit db674cb7012b6d578918739af0274823bca7cd07 Author: Wim <wim@42.be> Date: Wed Feb 28 22:23:29 2018 +0000 Improve debug messages diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go index 3c4d540..cfc6a81 100644 --- a/bridge/discord/discord.go +++ b/bridge/discord/discord.go @@ -967 +967 @@ func (b *Bdiscord) JoinChannel(channel config.ChannelInfo) error {  }    func (b *Bdiscord) Send(msg config.Message) (string, error) { - b.Log.Debugf("Receiving %#v", msg) + b.Log.Debugf("=> Receiving %#v", msg)     channelID := b.getChannelID(msg.Channel)   if channelID == "" { @@ -1808 +1808 @@ func (b *Bdiscord) messageDelete(s *discordgo.Session, m *discordgo.MessageDelet   if b.UseChannelID {   rmsg.Channel = "ID:" + m.ChannelID   } - b.Log.Debugf("Sending message from %s to gateway", b.Account) - b.Log.Debugf("Message is %#v", rmsg) + b.Log.Debugf("<= Sending message from %s to gateway", b.Account) + b.Log.Debugf("<= Message is %#v", rmsg)   b.Remote <- rmsg  }   @@ -2197 +2197 @@ func (b *Bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreat   rmsg := config.Message{Account: b.Account, Avatar: "https://cdn.discordapp.com/avatars/" + m.Author.ID + "/" + m.Author.Avatar + ".jpg", UserID: m.Author.ID, ID: m.ID}     if m.Content != "" { - b.Log.Debugf("Receiving message %#v", m.Message) + b.Log.Debugf("== Receiving event %#v", m.Message)   m.Message.Content = b.stripCustomoji(m.Message.Content)   m.Message.Content = b.replaceChannelMentions(m.Message.Content)   rmsg.Text, err = m.ContentWithMoreMentionsReplaced(b.c) @@ -2618 +2618 @@ func (b *Bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreat   rmsg.Event = config.EVENT_USER_ACTION   }   - b.Log.Debugf("Sending message from %s on %s to gateway", m.Author.Username, b.Account) - b.Log.Debugf("Message is %#v", rmsg) + b.Log.Debugf("<= Sending message from %s on %s to gateway", m.Author.Username, b.Account) + b.Log.Debugf("<= Message is %#v", rmsg)   b.Remote <- rmsg  }   diff --git a/bridge/gitter/gitter.go b/bridge/gitter/gitter.go index 0cd8e52..b7f69b1 100644 --- a/bridge/gitter/gitter.go +++ b/bridge/gitter/gitter.go @@ -717 +717 @@ func (b *Bgitter) JoinChannel(channel config.ChannelInfo) error {   case *gitter.MessageReceived:   // ignore message sent from ourselves   if ev.Message.From.ID != b.User.ID { - b.Log.Debugf("Sending message from %s on %s to gateway", ev.Message.From.Username, b.Account) + b.Log.Debugf("<= Sending message from %s on %s to gateway", ev.Message.From.Username, b.Account)   rmsg := config.Message{Username: ev.Message.From.Username, Text: ev.Message.Text, Channel: room,   Account: b.Account, Avatar: b.getAvatar(ev.Message.From.Username), UserID: ev.Message.From.ID,   ID: ev.Message.ID} @@ -797 +797 @@ func (b *Bgitter) JoinChannel(channel config.ChannelInfo) error {   rmsg.Event = config.EVENT_USER_ACTION   rmsg.Text = strings.Replace(rmsg.Text, "@"+ev.Message.From.Username+" ", "", -1)   } - b.Log.Debugf("Message is %#v", rmsg) + b.Log.Debugf("<= Message is %#v", rmsg)   b.Remote <- rmsg   }   case *gitter.GitterConnectionClosed: @@ -917 +917 @@ func (b *Bgitter) JoinChannel(channel config.ChannelInfo) error {  }    func (b *Bgitter) Send(msg config.Message) (string, error) { - b.Log.Debugf("Receiving %#v", msg) + b.Log.Debugf("=> Receiving %#v", msg)   roomID := b.getRoomID(msg.Channel)   if roomID == "" {   b.Log.Errorf("Could not find roomID for %v", msg.Channel) diff --git a/bridge/irc/irc.go b/bridge/irc/irc.go index afe436b..5f89d29 100644 --- a/bridge/irc/irc.go +++ b/bridge/irc/irc.go @@ -1567 +1567 @@ func (b *Birc) Send(msg config.Message) (string, error) {   return "", nil   }   - b.Log.Debugf("Receiving %#v", msg) + b.Log.Debugf("=> Receiving %#v", msg)     // Execute a command   if strings.HasPrefix(msg.Text, "!") { @@ -2899 +2899 @@ func (b *Birc) handleJoinPart(client *girc.Client, event girc.Event) {   }   }   if event.Source.Name != b.Nick { - b.Log.Debugf("Sending JOIN_LEAVE event from %s to gateway", b.Account) + b.Log.Debugf("<= Sending JOIN_LEAVE event from %s to gateway", b.Account)   msg := config.Message{Username: "system", Text: event.Source.Name + " " + strings.ToLower(event.Command) + "s", Channel: channel, Account: b.Account, Event: config.EVENT_JOIN_LEAVE} - b.Log.Debugf("Message is %#v", msg) + b.Log.Debugf("<= Message is %#v", msg)   b.Remote <- msg   return   } @@ -3527 +3527 @@ func (b *Birc) handlePrivMsg(client *girc.Client, event girc.Event) {   return   }   rmsg := config.Message{Username: event.Source.Name, Channel: strings.ToLower(event.Params[0]), Account: b.Account, UserID: event.Source.Ident + "@" + event.Source.Host} - b.Log.Debugf("Receiving PRIVMSG: %s %s %#v", event.Source.Name, event.Trailing, event) + b.Log.Debugf("== Receiving PRIVMSG: %s %s %#v", event.Source.Name, event.Trailing, event)     // set action event   if event.IsAction() { @@ -3937 +3937 @@ func (b *Birc) handlePrivMsg(client *girc.Client, event girc.Event) {   output, _ := ioutil.ReadAll(r)   rmsg.Text = string(output)   - b.Log.Debugf("Sending message from %s on %s to gateway", event.Params[0], b.Account) + b.Log.Debugf("<= Sending message from %s on %s to gateway", event.Params[0], b.Account)   b.Remote <- rmsg  }   diff --git a/bridge/matrix/matrix.go b/bridge/matrix/matrix.go index e7f7159..d6fd68e 100644 --- a/bridge/matrix/matrix.go +++ b/bridge/matrix/matrix.go @@ -657 +657 @@ func (b *Bmatrix) JoinChannel(channel config.ChannelInfo) error {  }    func (b *Bmatrix) Send(msg config.Message) (string, error) { - b.Log.Debugf("Receiving %#v", msg) + b.Log.Debugf("=> Receiving %#v", msg)     channel := b.getRoomID(msg.Channel)   b.Log.Debugf("Channel %s maps to channel id %s", msg.Channel, channel) @@ -1407 +1407 @@ func (b *Bmatrix) handlematrix() error {  }    func (b *Bmatrix) handleEvent(ev *matrix.Event) { - b.Log.Debugf("Received: %#v", ev) + b.Log.Debugf("== Receiving event: %#v", ev)   if ev.Sender != b.UserID {   b.RLock()   channel, ok := b.RoomMap[ev.RoomID] @@ -1897 +1897 @@ func (b *Bmatrix) handleEvent(ev *matrix.Event) {   }   }   - b.Log.Debugf("Sending message from %s on %s to gateway", ev.Sender, b.Account) + b.Log.Debugf("<= Sending message from %s on %s to gateway", ev.Sender, b.Account)   b.Remote <- rmsg   }  } diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go index af52270..dffb421 100644 --- a/bridge/mattermost/mattermost.go +++ b/bridge/mattermost/mattermost.go @@ -1157 +1157 @@ func (b *Bmattermost) JoinChannel(channel config.ChannelInfo) error {  }    func (b *Bmattermost) Send(msg config.Message) (string, error) { - b.Log.Debugf("Receiving %#v", msg) + b.Log.Debugf("=> Receiving %#v", msg)     // Make a action /me of the message   if msg.Event == config.EVENT_USER_ACTION { @@ -1858 +1858 @@ func (b *Bmattermost) handleMatter() {   if ok {   message.Event = config.EVENT_USER_ACTION   } - b.Log.Debugf("Sending message from %s on %s to gateway", message.Username, b.Account) - b.Log.Debugf("Message is %#v", message) + b.Log.Debugf("<= Sending message from %s on %s to gateway", message.Username, b.Account) + b.Log.Debugf("<= Message is %#v", message)   b.Remote <- *message   }  } @@ -2057 +2057 @@ func (b *Bmattermost) handleMatterClient(messages chan *config.Message) {   b.handleDownloadAvatar(message.UserID, message.Channel)   }   - b.Log.Debugf("Receiving from matterclient %#v", message) + b.Log.Debugf("== Receiving event %#v", message)     rmsg := &config.Message{Username: message.Username, UserID: message.UserID, Channel: message.Channel, Text: message.Text, ID: message.Post.Id, Extra: make(map[string][]interface{})}   diff --git a/bridge/rocketchat/rocketchat.go b/bridge/rocketchat/rocketchat.go index 8f025d2..fa6bdd5 100644 --- a/bridge/rocketchat/rocketchat.go +++ b/bridge/rocketchat/rocketchat.go @@ -507 +507 @@ func (b *Brocketchat) Send(msg config.Message) (string, error) {   if msg.Event == config.EVENT_MSG_DELETE {   return "", nil   } - b.Log.Debugf("Receiving %#v", msg) + b.Log.Debugf("=> Receiving %#v", msg)   if msg.Extra != nil {   for _, rmsg := range helper.HandleExtra(&msg, b.General) {   matterMessage := matterhook.OMessage{IconURL: b.Config.IconURL, Channel: rmsg.Channel, UserName: rmsg.Username, @@ -887 +887 @@ func (b *Brocketchat) handleRocketHook() {   if message.UserName == b.Config.Nick {   continue   } - b.Log.Debugf("Sending message from %s on %s to gateway", message.UserName, b.Account) + b.Log.Debugf("<= Sending message from %s on %s to gateway", message.UserName, b.Account)   b.Remote <- config.Message{Text: message.Text, Username: message.UserName, Channel: message.ChannelName, Account: b.Account, UserID: message.UserID}   }  } diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go index 7f50640..009a33a 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -1087 +1087 @@ func (b *Bslack) JoinChannel(channel config.ChannelInfo) error {  }    func (b *Bslack) Send(msg config.Message) (string, error) { - b.Log.Debugf("Receiving %#v", msg) + b.Log.Debugf("=> Receiving %#v", msg)     // Make a action /me of the message   if msg.Event == config.EVENT_USER_ACTION { @@ -1907 +1906 @@ func (b *Bslack) Send(msg config.Message) (string, error) {   }     // Post normal message - b.Log.Debugf("NP IS %#v", np)   _, id, err := b.sc.PostMessage(schannel.ID, msg.Text, np)   if err != nil {   return "", err @@ -2467 +2457 @@ func (b *Bslack) handleSlack() {   time.Sleep(time.Second)   b.Log.Debug("Start listening for Slack messages")   for message := range messages { - b.Log.Debugf("Sending message from %s on %s to gateway", message.Username, b.Account) + b.Log.Debugf("<= Sending message from %s on %s to gateway", message.Username, b.Account)     // cleanup the message   message.Text = b.replaceURL(message.Text) @@ -2587 +2577 @@ func (b *Bslack) handleSlack() {   // Add the avatar   message.Avatar = b.getAvatar(message.Username)   - b.Log.Debugf("Message is %#v", message) + b.Log.Debugf("<= Message is %#v", message)   b.Remote <- *message   }  } @@ -2667 +2657 @@ func (b *Bslack) handleSlack() {  func (b *Bslack) handleSlackClient(messages chan *config.Message) {   for msg := range b.rtm.IncomingEvents {   if msg.Type != "user_typing" && msg.Type != "latency_report" { - b.Log.Debugf("Receiving from slackclient %#v", msg.Data) + b.Log.Debugf("== Receiving event %#v", msg.Data)   }   switch ev := msg.Data.(type) {   case *slack.MessageEvent: diff --git a/bridge/sshchat/sshchat.go b/bridge/sshchat/sshchat.go index ab6b06c..c11d3da 100644 --- a/bridge/sshchat/sshchat.go +++ b/bridge/sshchat/sshchat.go @@ -557 +557 @@ func (b *Bsshchat) Send(msg config.Message) (string, error) {   if msg.Event == config.EVENT_MSG_DELETE {   return "", nil   } - b.Log.Debugf("Receiving %#v", msg) + b.Log.Debugf("=> Receiving %#v", msg)   if msg.Extra != nil {   for _, rmsg := range helper.HandleExtra(&msg, b.General) {   b.w.Write([]byte(rmsg.Username + rmsg.Text + "\r\n")) @@ -1247 +1247 @@ func (b *Bsshchat) handleSshChat() error {   continue   }   if !wait { - b.Log.Debugf("message %#v", res) + b.Log.Debugf("<= Message %#v", res)   rmsg := config.Message{Username: res[0], Text: strings.Join(res[1:], ":"), Channel: "sshchat", Account: b.Account, UserID: "nick"}   b.Remote <- rmsg   } diff --git a/bridge/steam/steam.go b/bridge/steam/steam.go index 0a3a03e..a0bf757 100644 --- a/bridge/steam/steam.go +++ b/bridge/steam/steam.go @@ -927 +927 @@ func (b *Bsteam) handleEvents() {   switch e := event.(type) {   case *steam.ChatMsgEvent:   b.Log.Debugf("Receiving ChatMsgEvent: %#v", e) - b.Log.Debugf("Sending message from %s on %s to gateway", b.getNick(e.ChatterId), b.Account) + b.Log.Debugf("<= Sending message from %s on %s to gateway", b.getNick(e.ChatterId), b.Account)   var channel int64   if e.ChatRoomId == 0 {   channel = int64(e.ChatterId) diff --git a/bridge/telegram/telegram.go b/bridge/telegram/telegram.go index b407e0c..073eda7 100644 --- a/bridge/telegram/telegram.go +++ b/bridge/telegram/telegram.go @@ -507 +507 @@ func (b *Btelegram) JoinChannel(channel config.ChannelInfo) error {  }    func (b *Btelegram) Send(msg config.Message) (string, error) { - b.Log.Debugf("Receiving %#v", msg) + b.Log.Debugf("=> Receiving %#v", msg)     // get the chatid   chatid, err := strconv.ParseInt(msg.Channel, 10, 64) @@ -1197 +1197 @@ func (b *Btelegram) Send(msg config.Message) (string, error) {    func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) {   for update := range updates { - b.Log.Debugf("Receiving from telegram: %#v", update.Message) + b.Log.Debugf("== Receiving event: %#v", update.Message)     if update.Message == nil && update.ChannelPost == nil {   b.Log.Error("Getting nil messages, this shouldn't happen.") @@ -2268 +2268 @@ func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) {   if rmsg.Text != "" || len(rmsg.Extra) > 0 {   rmsg.Avatar = helper.GetAvatar(b.avatarMap, strconv.Itoa(message.From.ID), b.General)   - b.Log.Debugf("Sending message from %s on %s to gateway", rmsg.Username, b.Account) - b.Log.Debugf("Message is %#v", rmsg) + b.Log.Debugf("<= Sending message from %s on %s to gateway", rmsg.Username, b.Account) + b.Log.Debugf("<= Message is %#v", rmsg)   b.Remote <- rmsg   }   } diff --git a/bridge/xmpp/xmpp.go b/bridge/xmpp/xmpp.go index 990d6f3..b1c1255 100644 --- a/bridge/xmpp/xmpp.go +++ b/bridge/xmpp/xmpp.go @@ -727 +727 @@ func (b *Bxmpp) Send(msg config.Message) (string, error) {   if msg.Event == config.EVENT_MSG_DELETE {   return "", nil   } - b.Log.Debugf("Receiving %#v", msg) + b.Log.Debugf("=> Receiving %#v", msg)     // Upload a file (in xmpp case send the upload URL because xmpp has no native upload support)   if msg.Extra != nil { @@ -1618 +1618 @@ func (b *Bxmpp) handleXMPP() error {   if ok {   rmsg.Event = config.EVENT_USER_ACTION   } - b.Log.Debugf("Sending message from %s on %s to gateway", rmsg.Username, b.Account) - b.Log.Debugf("Message is %#v", rmsg) + b.Log.Debugf("<= Sending message from %s on %s to gateway", rmsg.Username, b.Account) + b.Log.Debugf("<= Message is %#v", rmsg)   b.Remote <- rmsg   }   case xmpp.Presence: diff --git a/gateway/gateway.go b/gateway/gateway.go index dc3a357..27ffed7 100644 --- a/gateway/gateway.go +++ b/gateway/gateway.go @@ -2567 +2567 @@ func (gw *Gateway) handleMessage(msg config.Message, dest *bridge.Bridge) []*BrM   continue   }   } - flog.Debugf("Sending %#v from %s (%s) to %s (%s)", msg, msg.Account, originchannel, dest.Account, channel.Name) + flog.Debugf("=> Sending %#v from %s (%s) to %s (%s)", msg, msg.Account, originchannel, dest.Account, channel.Name)   msg.Channel = channel.Name   msg.Avatar = gw.modifyAvatar(origmsg, dest)   msg.Username = gw.modifyUsername(origmsg, dest) @@ -2816 +2817 @@ func (gw *Gateway) handleMessage(msg config.Message, dest *bridge.Bridge) []*BrM   }   // append the message ID (mID) from this bridge (dest) to our brMsgIDs slice   if mID != "" { + flog.Debugf("mID %s: %s", dest.Account, mID)   brMsgIDs = append(brMsgIDs, &BrMsgID{dest, mID, channel.ID})   }   }