From fb2f2d9a39fec6388f9c8a2de2cc588a87135c0c Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Fri, 7 Oct 2022 20:44:47 +0200
Subject: [PATCH] Allow webhook message setting directly

---
 freqtrade/constants.py        | 5 ++++-
 freqtrade/rpc/rpc_manager.py  | 2 +-
 freqtrade/rpc/webhook.py      | 7 +++++--
 tests/rpc/test_rpc_manager.py | 5 +++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/freqtrade/constants.py b/freqtrade/constants.py
index e0eb5e288..27968bb1b 100644
--- a/freqtrade/constants.py
+++ b/freqtrade/constants.py
@@ -5,7 +5,7 @@ bot constants
 """
 from typing import Any, Dict, List, Literal, Tuple
 
-from freqtrade.enums import CandleType
+from freqtrade.enums import CandleType, RPCMessageType
 
 
 DEFAULT_CONFIG = 'config.json'
@@ -282,6 +282,7 @@ CONF_SCHEMA = {
                 'enabled': {'type': 'boolean'},
                 'token': {'type': 'string'},
                 'chat_id': {'type': 'string'},
+                'allow_custom_messages': {'type': 'boolean', 'default': True},
                 'balance_dust_level': {'type': 'number', 'minimum': 0.0},
                 'notification_settings': {
                     'type': 'object',
@@ -344,6 +345,8 @@ CONF_SCHEMA = {
                 'format': {'type': 'string', 'enum': WEBHOOK_FORMAT_OPTIONS, 'default': 'form'},
                 'retries': {'type': 'integer', 'minimum': 0},
                 'retry_delay': {'type': 'number', 'minimum': 0},
+                **dict([(x, {'type': 'object'}) for x in RPCMessageType]),
+                # Below -> Deprecated
                 'webhookentry': {'type': 'object'},
                 'webhookentrycancel': {'type': 'object'},
                 'webhookentryfill': {'type': 'object'},
diff --git a/freqtrade/rpc/rpc_manager.py b/freqtrade/rpc/rpc_manager.py
index bc13c1654..9c25723b0 100644
--- a/freqtrade/rpc/rpc_manager.py
+++ b/freqtrade/rpc/rpc_manager.py
@@ -88,7 +88,7 @@ class RPCManager:
         """
         while queue:
             msg = queue.popleft()
-
+            logger.info('Sending rpc strategy_msg: %s', msg)
             for mod in self.registered_modules:
                 if mod._config.get(mod.name, {}).get('allow_custom_messages', False):
                     mod.send_msg({
diff --git a/freqtrade/rpc/webhook.py b/freqtrade/rpc/webhook.py
index bb3b3922f..b46addee5 100644
--- a/freqtrade/rpc/webhook.py
+++ b/freqtrade/rpc/webhook.py
@@ -45,6 +45,7 @@ class Webhook(RPCHandler):
         """ Send a message to telegram channel """
         try:
             whconfig = self._config['webhook']
+            # Deprecated 2022.10 - only keep generic method.
             if msg['type'] in [RPCMessageType.ENTRY]:
                 valuedict = whconfig.get('webhookentry')
             elif msg['type'] in [RPCMessageType.ENTRY_CANCEL]:
@@ -61,6 +62,9 @@ class Webhook(RPCHandler):
                                  RPCMessageType.STARTUP,
                                  RPCMessageType.WARNING):
                 valuedict = whconfig.get('webhookstatus')
+            elif msg['type'].value in whconfig:
+                # Allow all types ...
+                valuedict = whconfig.get(msg['type'].value)
             elif msg['type'] in (
                     RPCMessageType.PROTECTION_TRIGGER,
                     RPCMessageType.PROTECTION_TRIGGER_GLOBAL,
@@ -69,8 +73,7 @@ class Webhook(RPCHandler):
                     RPCMessageType.STRATEGY_MSG):
                 # Don't fail for non-implemented types
                 return
-            else:
-                raise NotImplementedError('Unknown message type: {}'.format(msg['type']))
+
             if not valuedict:
                 logger.info("Message type '%s' not configured for webhooks", msg['type'])
                 return
diff --git a/tests/rpc/test_rpc_manager.py b/tests/rpc/test_rpc_manager.py
index d71f38259..21c8b0813 100644
--- a/tests/rpc/test_rpc_manager.py
+++ b/tests/rpc/test_rpc_manager.py
@@ -99,6 +99,7 @@ def test_send_msg_telegram_error(mocker, default_conf, caplog) -> None:
 
 def test_process_msg_queue(mocker, default_conf, caplog) -> None:
     telegram_mock = mocker.patch('freqtrade.rpc.telegram.Telegram.send_msg')
+    default_conf['telegram']['allow_custom_messages'] = True
     mocker.patch('freqtrade.rpc.telegram.Telegram._init')
 
     freqtradebot = get_patched_freqtradebot(mocker, default_conf)
@@ -108,8 +109,8 @@ def test_process_msg_queue(mocker, default_conf, caplog) -> None:
     queue.append('Test message 2')
     rpc_manager.process_msg_queue(queue)
 
-    assert log_has("Sending rpc message: {'type': strategy_msg, 'msg': 'Test message'}", caplog)
-    assert log_has("Sending rpc message: {'type': strategy_msg, 'msg': 'Test message 2'}", caplog)
+    assert log_has("Sending rpc strategy_msg: Test message", caplog)
+    assert log_has("Sending rpc strategy_msg: Test message 2", caplog)
     assert telegram_mock.call_count == 2