diff options
| author | Duco van Amstel <duco.vanamstel@gmail.com> | 2018-10-07 14:22:15 +0100 |
|---|---|---|
| committer | Wim <wim@42.be> | 2018-10-07 15:22:15 +0200 |
| commit | 69646a160d8597944c307334901f0acfd32582c5 (patch) | |
| tree | d76d80bb16bd83a07c1015e7038ab4b3c64e953d | |
| parent | 54adb0509e8f22bdfa70a88834c6499e4078648b (diff) | |
| download | matterbridge-msglm-69646a160d8597944c307334901f0acfd32582c5.tar.gz matterbridge-msglm-69646a160d8597944c307334901f0acfd32582c5.tar.bz2 matterbridge-msglm-69646a160d8597944c307334901f0acfd32582c5.zip | |
Add Gateway's name to RemoteNickFormat (#501)
In order to support extra use cases we should add the `{GATEWAY}` tag to the `RemoteNickFormat` string which would be replaced by the value of the `name=` field from a gateway's configuration.
This is _very_ useful when you are forwarding, for example, multiple channels from one chat to a single channel on another one (one-way). It will help you identify the source channel of a message on the target chat.
| -rw-r--r-- | gateway/gateway.go | 1 | ||||
| -rw-r--r-- | matterclient/matterclient.go | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gateway/gateway.go b/gateway/gateway.go index 6529393f..a33a9a97 100644 --- a/gateway/gateway.go +++ b/gateway/gateway.go @@ -374,6 +374,7 @@ func (gw *Gateway) modifyUsername(msg config.Message, dest *bridge.Bridge) strin nick = strings.Replace(nick, "{BRIDGE}", br.Name, -1) nick = strings.Replace(nick, "{PROTOCOL}", br.Protocol, -1) + nick = strings.Replace(nick, "{GATEWAY}", gw.Name, -1) nick = strings.Replace(nick, "{LABEL}", br.GetString("Label"), -1) nick = strings.Replace(nick, "{NICK}", msg.Username, -1) return nick diff --git a/matterclient/matterclient.go b/matterclient/matterclient.go index b86fbe3d..fbe331e9 100644 --- a/matterclient/matterclient.go +++ b/matterclient/matterclient.go @@ -344,7 +344,7 @@ func (m *MMClient) parseActionPost(rmsg *Message) { data := model.PostFromJson(strings.NewReader(rmsg.Raw.Data["post"].(string))) // we don't have the user, refresh the userlist if m.GetUser(data.UserId) == nil { - m.log.Infof("User %s is not known, ignoring message %s", data) + m.log.Infof("User %s is not known, ignoring message %s", data.UserId, data.Message) return } rmsg.Username = m.GetUserName(data.UserId) |