4
0
mirror of https://github.com/cwinfo/matterbridge.git synced 2025-06-26 21:19:22 +00:00

Compare commits

...

3 Commits

Author SHA1 Message Date
Wim
bb38a61f3b Release v1.5.1 2017-12-07 22:28:47 +01:00
Wim
c447647af9 Split on UTF-8 for MessageSplit (irc). Closes #308 2017-12-07 22:22:25 +01:00
Wim
1de64f3f61 Fix irc ACTION regression (irc). Closes #306 2017-12-07 22:09:01 +01:00
2 changed files with 5 additions and 5 deletions

View File

@ -197,8 +197,9 @@ func (b *Birc) Send(msg config.Message) (string, error) {
msg.Text = helper.SplitStringLength(msg.Text, b.Config.MessageLength) msg.Text = helper.SplitStringLength(msg.Text, b.Config.MessageLength)
} }
for _, text := range strings.Split(msg.Text, "\n") { for _, text := range strings.Split(msg.Text, "\n") {
input := []rune(text)
if len(text) > b.Config.MessageLength { if len(text) > b.Config.MessageLength {
text = text[:b.Config.MessageLength] + " <message clipped>" text = string(input[:b.Config.MessageLength]) + " <message clipped>"
} }
if len(b.Local) < b.Config.MessageQueue { if len(b.Local) < b.Config.MessageQueue {
if len(b.Local) == b.Config.MessageQueue-1 { if len(b.Local) == b.Config.MessageQueue-1 {
@ -327,11 +328,10 @@ func (b *Birc) handlePrivMsg(client *girc.Client, event girc.Event) {
rmsg := config.Message{Username: event.Source.Name, Channel: event.Params[0], Account: b.Account, UserID: event.Source.Ident + "@" + event.Source.Host} rmsg := config.Message{Username: event.Source.Name, Channel: event.Params[0], Account: b.Account, UserID: event.Source.Ident + "@" + event.Source.Host}
flog.Debugf("handlePrivMsg() %s %s %#v", event.Source.Name, event.Trailing, event) flog.Debugf("handlePrivMsg() %s %s %#v", event.Source.Name, event.Trailing, event)
msg := "" msg := ""
if event.Command == "CTCP_ACTION" { if event.IsAction() {
// msg = event.Source.Name + " "
rmsg.Event = config.EVENT_USER_ACTION rmsg.Event = config.EVENT_USER_ACTION
} }
msg += event.Trailing msg += event.StripAction()
// strip IRC colors // strip IRC colors
re := regexp.MustCompile(`[[:cntrl:]](?:\d{1,2}(?:,\d{1,2})?)?`) re := regexp.MustCompile(`[[:cntrl:]](?:\d{1,2}(?:,\d{1,2})?)?`)
msg = re.ReplaceAllString(msg, "") msg = re.ReplaceAllString(msg, "")

View File

@ -12,7 +12,7 @@ import (
) )
var ( var (
version = "1.5.0" version = "1.5.1"
githash string githash string
) )