4
0
mirror of https://github.com/cwinfo/matterbridge.git synced 2025-06-26 17:49:23 +00:00

Compare commits

...

5 Commits

6 changed files with 16 additions and 7 deletions

View File

@ -69,7 +69,7 @@ See https://github.com/42wim/matterbridge/wiki
# Installing
## Binaries
* Latest stable release [v1.11.2](https://github.com/42wim/matterbridge/releases/latest)
* Latest stable release [v1.11.3](https://github.com/42wim/matterbridge/releases/latest)
* Development releases (follows master) can be downloaded [here](https://dl.bintray.com/42wim/nightly/)
## Building

View File

@ -306,7 +306,7 @@ func (b *Birc) handleJoinPart(client *girc.Client, event girc.Event) {
return
}
channel := strings.ToLower(event.Params[0])
if event.Command == "KICK" {
if event.Command == "KICK" && event.Params[1] == b.Nick {
b.Log.Infof("Got kicked from %s by %s", channel, event.Source.Name)
time.Sleep(time.Duration(b.GetInt("RejoinDelay")) * time.Second)
b.Remote <- config.Message{Username: "system", Text: "rejoin", Channel: channel, Account: b.Account, Event: config.EVENT_REJOIN_CHANNELS}

View File

@ -185,9 +185,6 @@ func (b *Bmattermost) handleMatter() {
for message := range messages {
message.Avatar = helper.GetAvatar(b.avatarMap, message.UserID, b.General)
message.Account = b.Account
if nick := b.mc.GetNickName(message.UserID); nick != "" {
message.Username = nick
}
message.Text, ok = b.replaceAction(message.Text)
if ok {
message.Event = config.EVENT_USER_ACTION
@ -256,6 +253,11 @@ func (b *Bmattermost) handleMatterClient(messages chan *config.Message) {
}
}
}
// Use nickname instead of username if defined
if nick := b.mc.GetNickName(rmsg.UserID); nick != "" {
rmsg.Username = nick
}
messages <- rmsg
}
}

View File

@ -318,7 +318,7 @@ func (b *Bslack) handleSlackClient(messages chan *config.Message) {
b.Usergroups, _ = b.sc.GetUserGroups()
case *slack.ConnectedEvent:
var err error
b.channels, _, err = b.sc.GetConversations(&slack.GetConversationsParameters{})
b.channels, _, err = b.sc.GetConversations(&slack.GetConversationsParameters{Limit: 1000, Types: []string{"public_channel,private_channel,mpim,im"}})
if err != nil {
b.Log.Errorf("Channel list failed: %#v", err)
}

View File

@ -1,3 +1,10 @@
# v1.11.3
## Bugfix
* mattermost: fix panic when using webhooks #491
* slack: fix issues regarding API changes and lots of channels #489
* irc: fix rejoin on kick problem #488
# v1.11.2
## Bugfix

View File

@ -14,7 +14,7 @@ import (
)
var (
version = "1.11.2"
version = "1.11.3"
githash string
)