commit 103d30e24055ddbe471568b00e30d67f766186ed
Author: Wim <wim@42.be>
Date: Wed Oct 21 20:35:22 2020 +0000
Show deprecate warnings about old tengo settings (#1271)
diff --git a/gateway/gateway.go b/gateway/gateway.go
index 27265d1..7a5ca8c 100644
--- a/gateway/gateway.go
+++ b/gateway/gateway.go
@@ -36310 +36323 @@ func (gw *Gateway) modifyAvatar(msg *config.Message, dest *bridge.Bridge) string
}
func (gw *Gateway) modifyMessage(msg *config.Message) {
- if err := modifyMessageTengo(gw.BridgeValues().General.TengoModifyMessage, msg); err != nil {
+ if gw.BridgeValues().General.TengoModifyMessage != "" {
+ gw.logger.Warnf("General TengoModifyMessage=%s is deprecated and will be removed in v1.20.0, please move to Tengo InMessage=%s", gw.BridgeValues().General.TengoModifyMessage, gw.BridgeValues().General.TengoModifyMessage)
+ }
+
+ if err := modifyInMessageTengo(gw.BridgeValues().General.TengoModifyMessage, msg); err != nil {
gw.logger.Errorf("TengoModifyMessage failed: %s", err)
}
- if err := modifyMessageTengo(gw.BridgeValues().Tengo.Message, msg); err != nil {
+
+ inMessage := gw.BridgeValues().Tengo.InMessage
+ if inMessage == "" {
+ inMessage = gw.BridgeValues().Tengo.Message
+ if inMessage != "" {
+ gw.logger.Warnf("Tengo Message=%s is deprecated and will be removed in v1.20.0, please move to Tengo InMessage=%s", inMessage, inMessage)
+ }
+ }
+
+ if err := modifyInMessageTengo(inMessage, msg); err != nil {
gw.logger.Errorf("Tengo.Message failed: %s", err)
}
@@ -4437 +4567 @@ func (gw *Gateway) SendMessage(
msg.ParentID = "msg-parent-not-found"
}
- err := gw.modifySendMessageTengo(rmsg, &msg, dest)
+ err := gw.modifyOutMessageTengo(rmsg, &msg, dest)
if err != nil {
gw.logger.Errorf("modifySendMessageTengo: %s", err)
}
@@ -5057 +5187 @@ func getProtocol(msg *config.Message) string {
return p[0]
}
-func modifyMessageTengo(filename string, msg *config.Message) error {
+func modifyInMessageTengo(filename string, msg *config.Message) error {
if filename == "" {
return nil
}
@@ -5647 +5777 @@ func (gw *Gateway) modifyUsernameTengo(msg *config.Message, br *bridge.Bridge) (
return c.Get("result").String(), nil
}
-func (gw *Gateway) modifySendMessageTengo(origmsg *config.Message, msg *config.Message, br *bridge.Bridge) error {
+func (gw *Gateway) modifyOutMessageTengo(origmsg *config.Message, msg *config.Message, br *bridge.Bridge) error {
filename := gw.BridgeValues().Tengo.OutMessage
var res []byte
var err error
diff --git a/gateway/gateway_test.go b/gateway/gateway_test.go
index 2d1a106..2170058 100644
--- a/gateway/gateway_test.go
+++ b/gateway/gateway_test.go
@@ -5337 +5337 @@ func (s *ignoreTestSuite) TestIgnoreNicks() {
func BenchmarkTengo(b *testing.B) {
msg := &config.Message{Username: "user", Text: "blah testing", Account: "protocol.account", Channel: "mychannel"}
for n := 0; n < b.N; n++ {
- err := modifyMessageTengo("bench.tengo", msg)
+ err := modifyInMessageTengo("bench.tengo", msg)
if err != nil {
return
}
