diff options
| author | Wim <wim@42.be> | 2022-03-19 23:14:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-19 23:14:56 +0100 |
| commit | f0f801402d95b1f49018fa9af77c341ff4c4de5f (patch) | |
| tree | d7ba0f532c2a9accf702d3347d2efba725e4419f /bridge/irc/handlers.go | |
| parent | 663850a2b825e762667f930cd5a4ee87de853444 (diff) | |
| download | matterbridge-msglm-f0f801402d95b1f49018fa9af77c341ff4c4de5f.tar.gz matterbridge-msglm-f0f801402d95b1f49018fa9af77c341ff4c4de5f.tar.bz2 matterbridge-msglm-f0f801402d95b1f49018fa9af77c341ff4c4de5f.zip | |
Refactor utf-8 conversion (irc) (#1767)
Diffstat (limited to 'bridge/irc/handlers.go')
| -rw-r--r-- | bridge/irc/handlers.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bridge/irc/handlers.go b/bridge/irc/handlers.go index b90fa3af..987df2c5 100644 --- a/bridge/irc/handlers.go +++ b/bridge/irc/handlers.go @@ -11,7 +11,6 @@ import ( "github.com/42wim/matterbridge/bridge/config" "github.com/42wim/matterbridge/bridge/helper" "github.com/lrstanley/girc" - "github.com/missdeer/golib/ic" "github.com/paulrosania/go-charset/charset" "github.com/saintfish/chardet" @@ -24,12 +23,12 @@ func (b *Birc) handleCharset(msg *config.Message) error { if b.GetString("Charset") != "" { switch b.GetString("Charset") { case "gbk", "gb18030", "gb2312", "big5", "euc-kr", "euc-jp", "shift-jis", "iso-2022-jp": - msg.Text = ic.ConvertString("utf-8", b.GetString("Charset"), msg.Text) + msg.Text = toUTF8(b.GetString("Charset"), msg.Text) default: buf := new(bytes.Buffer) w, err := charset.NewWriter(b.GetString("Charset"), buf) if err != nil { - b.Log.Errorf("charset from utf-8 conversion failed: %s", err) + b.Log.Errorf("charset to utf-8 conversion failed: %s", err) return err } fmt.Fprint(w, msg.Text) @@ -227,7 +226,7 @@ func (b *Birc) handlePrivMsg(client *girc.Client, event girc.Event) { } switch mycharset { case "gbk", "gb18030", "gb2312", "big5", "euc-kr", "euc-jp", "shift-jis", "iso-2022-jp": - rmsg.Text = ic.ConvertString("utf-8", b.GetString("Charset"), rmsg.Text) + rmsg.Text = toUTF8(b.GetString("Charset"), rmsg.Text) default: r, err := charset.NewReader(mycharset, strings.NewReader(rmsg.Text)) if err != nil { |