Drakkar-Software · GuillaumeDSM · Oct 29, 2023 · Oct 29, 2023
diff --git a/Evaluator/Social/signal_evaluator/resources/TelegramChannelSignalEvaluator.md b/Evaluator/Social/signal_evaluator/resources/TelegramChannelSignalEvaluator.md
@@ -4,4 +4,4 @@ Triggers on a Telegram signal from any channel your personal account joined.
 
 Signal parsing is configurable according to the name of the channel.
 
-See [OctoBot docs about Telegram API service](https://www.octobot.info/interfaces/telegram-interface/telegram-api) for more information.
+See [OctoBot docs about Telegram API service](https://www.octobot.cloud/guides/octobot-interfaces/telegram/telegram-api?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=telegramChannelSignalEvaluator) for more information.
diff --git a/Evaluator/Social/signal_evaluator/resources/TelegramSignalEvaluator.md b/Evaluator/Social/signal_evaluator/resources/TelegramSignalEvaluator.md
@@ -11,4 +11,4 @@ Remember that OctoBot can only see messages from a
 chat/group where its Telegram bot (in OctoBot configuration) has been invited. Keep also in mind that you
 need to disable the privacy mode of your Telegram bot to allow it to see group messages.
 
-See [OctoBot docs about Telegram interface](https://www.octobot.info/interfaces/telegram-interface) for more information.
+See [OctoBot docs about Telegram interface](https://www.octobot.cloud/guides/octobot-interfaces/telegram?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=telegramSignalEvaluator) for more information.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ This repository contains default evaluators, strategies, utilitary modules, inte
 
 Modules in this tentacles are installed in the **Default** folder of the associated module types
 
-To add custom tentacles to your OctoBot, see the [dedicated docs page](https://developer.octobot.info/tentacles/customize-your-octobot).
+To add custom tentacles to your OctoBot, see the [dedicated docs page](https://www.octobot.cloud/guides/octobot-tentacles-development/customize-your-octobot?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=octobot_tentacles_readme).
 
 ## Contributing to the official OctoBot Tentacles:
 1. Create your own fork of this repo

diff --git a/Services/Interfaces/web_interface/advanced_templates/advanced_strategy_optimizer.html b/Services/Interfaces/web_interface/advanced_templates/advanced_strategy_optimizer.html
@@ -5,7 +5,7 @@
 <div class="card" id="strategyOptimizerInputs">
     <div class="card-header">
         <h1>Strategy optimizer
-            <a class="float-right blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/advanced_usage/backtesting-and-strategy-optimization#strategy-optimizer">
+            <a class="float-right blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/octobot-advanced-usage/backtesting-and-strategy-optimization#strategy-optimizer">
                 <i class="fa fa-question"></i>
             </a>
         </h1>
@@ -118,7 +118,7 @@ <h2>Strategy optimizer in progress</h2>
                 <i class="fa-regular fa-lightbulb"></i>
                 If you want to deeply test your strategy, compare its results in different situations and figure out
                 the best settings for your traded markets, we suggest to check out the
-                <a href="https://blog.octobot.online/strategy-designer-revamp" target="_blank" rel="noopener">
+                <a href="https://www.octobot.cloud/blog/strategy-designer-revamp?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=strategy_optimizer" target="_blank" rel="noopener">
                     new strategy designer </a>
                 available on <a href="{{OCTOBOT_COMMUNITY_URL}}/" target="_blank" rel="noopener">
                 <i class="fa-brands fa-octopus-deploy"></i> octobot.cloud pro plan</a>.

diff --git a/Services/Interfaces/web_interface/advanced_templates/advanced_tentacle_packages.html b/Services/Interfaces/web_interface/advanced_templates/advanced_tentacle_packages.html
@@ -12,7 +12,7 @@ <h2>
                 </a>
             </span>
             &ensp;Tentacle Packages
-            <a class="float-right blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/advanced_usage/tentacle-manager#add-new-tentacles-packages-to-your-octobot">
+            <a class="float-right blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/octobot-advanced-usage/tentacle-manager#add-new-tentacles-packages-to-your-octobot">
                 <i class="fa fa-question"></i>
             </a>
         </h2>

diff --git a/Services/Interfaces/web_interface/advanced_templates/advanced_tentacles.html b/Services/Interfaces/web_interface/advanced_templates/advanced_tentacles.html
@@ -6,7 +6,7 @@
     <div class="card-header">
         <h2>Installed Tentacles
         <span class="float-right">
-            <a class="blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/advanced_usage/tentacle-manager">
+            <a class="blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/octobot-advanced-usage/tentacle-manager?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=advanced_tentacles">
                 <i class="fa fa-question"></i>
             </a>
         </span>

diff --git a/Services/Interfaces/web_interface/static/js/common/tutorial.js b/Services/Interfaces/web_interface/static/js/common/tutorial.js
@@ -119,7 +119,7 @@ _TUTORIALS = {
                 },
                 {
                     title: 'See also',
-                    intro: `More details on ${getDocsLink("/configuration/profiles", "the profiles guide")}.`
+                    intro: `More details on ${getDocsLink("/octobot-configuration/profiles?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=profiles_intro", "the profiles guide")}.`
                 },
             ]
         }
@@ -202,7 +202,7 @@ _TUTORIALS = {
                 },
                 {
                     title: 'See also',
-                    intro: `More details on ${getDocsLink("/usage/understanding-profitability", "the OctoBot docs")}.`
+                    intro: `More details on ${getDocsLink("/octobot-usage/understanding-profitability?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=dashboard_intro", "the OctoBot docs")}.`
                 },
             ]
         }
@@ -222,7 +222,7 @@ _TUTORIALS = {
                 },
                 {
                     title: 'See also',
-                    intro: `More details on supported exchanges in the ${getExchangesDocsLink("", "OctoBot exchanges docs")}.`
+                    intro: `More details on supported exchanges in the ${getExchangesDocsLink("?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=exchanges_config", "OctoBot exchanges docs")}.`
                 },
             ]
         }
@@ -242,7 +242,7 @@ _TUTORIALS = {
                 },
                 {
                     title: 'See also',
-                    intro: `More details the ${getDocsLink("/advanced_usage/backtesting-and-strategy-optimization", "backtesting guide")}.`
+                    intro: `More details the ${getDocsLink("/octobot-advanced-usage/backtesting-and-strategy-optimization?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=backtesting_intro", "backtesting guide")}.`
                 },
             ]
         }

diff --git a/Services/Interfaces/web_interface/templates/about.html b/Services/Interfaces/web_interface/templates/about.html
@@ -52,7 +52,7 @@ <h2>Get more from OctoBot using OctoBot cloud</h2>
                         </li>
                         <li>
                             Deploy your OctoBot on the cloud and enjoy your OctoBot from anywhere while benefiting
-                            from cloud exclusive features such as the <a href="https://blog.octobot.online/strategy-designer-revamp" target="_blank" rel="noopener">strategy designer</a>.
+                            from cloud exclusive features such as the <a href="https://www.octobot.cloud/blog/strategy-designer-revamp?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=about" target="_blank" rel="noopener">strategy designer</a>.
                         </li>
                     </ul>
                 <p>
@@ -77,7 +77,7 @@ <h2>Help us to improve OctoBot</h2>
         <div class="mb-4">
             Any question ?
             Please have a look at our
-            <a target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/usage/frequently-asked-questions-faq">
+            <a target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/octobot-usage/frequently-asked-questions-faq?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=faq">
                 Frequently ask question (FAQ) section
             </a>
             first !
@@ -155,7 +155,7 @@ <h2>Support the OctoBot project</h2>
             Registering to the beta tester group will grant you access to major new features weeks in advance as well
             as a direct communication channel to the OctoBot team to share your feedback and ideas before new versions are
             released to the public.
-            <a href="{{OCTOBOT_DOCS_URL}}/advanced_usage/beta-program" target="_blank" rel="noopener">
+            <a href="{{OCTOBOT_DOCS_URL}}/octobot-advanced-usage/beta-program?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=beta_program" target="_blank" rel="noopener">
                 More info on the beta tester program
             </a>
         </p>

diff --git a/Services/Interfaces/web_interface/templates/accounts.html b/Services/Interfaces/web_interface/templates/accounts.html
@@ -135,7 +135,7 @@ <h2>Exchanges
             <div class="card-header">
                 <h2>
                     Notifications
-                    <a class="float-right blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/configuration/accounts#notifications">
+                    <a class="float-right blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/octobot-configuration/accounts#notifications">
                         <i class="fa-solid fa-question"></i>
                     </a>
                 </h2>

diff --git a/Services/Interfaces/web_interface/templates/components/config/profiles.html b/Services/Interfaces/web_interface/templates/components/config/profiles.html
@@ -242,7 +242,7 @@ <h2 class="card-title" id="#profileModalLabel">
                         data-toggle="tooltip" title="Use this profile">
                     <i class="fas fa-check" aria-hidden="true"></i>
                 </button>
-                <a class="float-right blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/configuration/profiles">
+                <a class="float-right blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/octobot-configuration/profiles?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=profiles_config">
                     &nbsp <i class="fa-solid fa-question"></i>
                 </a>
             </h2>

diff --git a/Services/Interfaces/web_interface/templates/components/config/service_card.html b/Services/Interfaces/web_interface/templates/components/config/service_card.html
@@ -21,7 +21,7 @@ <h4 class="text-capitalize">
                 {% endif %}
                 <div>
                     <h4>
-                        <a class="blue-text" target="_blank" rel="noopener" href="{{service.get_help_page()}}">
+                        <a class="blue-text" target="_blank" rel="noopener" href="{{service.get_help_page()}}?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=service_config">
                             <i class="fa-solid fa-question"></i>
                         </a>
                     </h4>

diff --git a/Services/Interfaces/web_interface/templates/config_tentacle.html b/Services/Interfaces/web_interface/templates/config_tentacle.html
@@ -36,7 +36,7 @@ <h2>Configuration
                         role="button" data-toggle="tooltip" title="Save">
                     <i class="fas fa-save" aria-hidden="true"></i>
                 </button>
-                <a class="float-right blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/configuration/profile-configuration#specific-evaluator-configuration">
+                <a class="float-right blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/octobot-configuration/profile-configuration#specific-evaluator-configuration">
                     <i class="fa-solid fa-question"></i>
                 </a>
             </h2>
@@ -195,7 +195,7 @@ <h2>Test configuration
                         <span class="badge badge-warning text-center waves-effect">Activation required <i class="fas fa-sync-alt"></i></span>
                     </a>
                 {% endif %}
-                <a class="float-right blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/advanced_usage/backtesting-and-strategy-optimization">
+                <a class="float-right blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/octobot-advanced-usage/backtesting-and-strategy-optimization?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=config_tentacles">
                     &nbsp <i class="fa-solid fa-question"></i>
                 </a>
                 {% if activated_trading_mode %}

diff --git a/Services/Interfaces/web_interface/templates/index.html b/Services/Interfaces/web_interface/templates/index.html
@@ -53,7 +53,7 @@ <h4>
                 <div class="col-12 col-lg-4 col-xl-5 card-text py-3">
                     <p>
                          Find more information the recent changes and future plans on
-                        <a href="https://blog.octobot.online/introducing-the-new-octobot-cloud" target="_blank" rel="noopener"> our blog</a>.
+                        <a href="https://www.octobot.cloud/blog/introducing-the-new-octobot-cloud?utm_source=octobot&utm_medium=dk&utm_campaign=production_announcements&utm_content=dashboard" target="_blank" rel="noopener"> our blog</a>.
                     </p>
                     <p>
                         Please note that you will need to click "Forgot your password?" to set your password when first

diff --git a/Services/Interfaces/web_interface/templates/login.html b/Services/Interfaces/web_interface/templates/login.html
@@ -10,7 +10,7 @@
         <div class="card-header">
             <h2>
                 Welcome back
-                <a class="float-right blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/interfaces/web-interface#protect-your-web-interface">
+                <a class="float-right blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/octobot-interfaces/web#protect-your-web-interface">
                     <i class="fa-solid fa-question"></i>
                 </a>
             </h2>

diff --git a/Services/Interfaces/web_interface/templates/octobot_help.html b/Services/Interfaces/web_interface/templates/octobot_help.html
@@ -20,46 +20,46 @@ <h4>
             </h4>
             When using OctoBot, you will find these buttons: <a class="blue-text" target="_blank"><i class="fa-solid fa-question"></i></a>.
             They are triggering the in page help and contain links to the
-            <a target="_blank" rel="noopener" href="{{OCTOBOT_WEBSITE_URL}}"> OctoBot website</a> or
-            <a target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}"> OctoBot documentation</a> article related
+            <a target="_blank" rel="noopener" href="{{OCTOBOT_WEBSITE_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=octobot_help_buttons"> OctoBot website</a> or
+            <a target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=octobot_help_buttons"> OctoBot guides</a> explaining
             to the associated element.
         </p>
         <p class="help-section">
             <h4>
                 Frequently asked questions
             </h4>
             We keep track of many of our community users questions so that everyone can benefit from the answers in
-            <a target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/usage/frequently-asked-questions-faq">our dedicated FAQ</a>.
+            <a target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/octobot-usage/frequently-asked-questions-faq?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=octobot_help_faq">our dedicated FAQ</a>.
         </p>
         <p class="help-section">
             <h4>
                 Troubleshoot
             </h4>
             Some issues are pretty common and sometimes they are due to factors that are external to OctoBot. In the
-            <a target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/installation/installation-troubleshoot">troubleshoot section </a> you will
+            <a target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/octobot-installation/troubleshoot?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=octobot_help_troubleshoot">troubleshoot section </a> you will
             find many possible issues happening on various situations and how to fix them.
         </p>
         <p class="help-section">
             <h4>
                 OctoBot website
             </h4>
-            In the <a target="_blank" rel="noopener" href="{{OCTOBOT_WEBSITE_URL}}"> OctoBot website</a>, you will find many resources on various subjects including:
+            In the <a target="_blank" rel="noopener" href="{{OCTOBOT_WEBSITE_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=octobot_help_details"> OctoBot website</a>, you will find many resources on various subjects including:
             <ul>
                 <li>
                     What is the OctoBot Project
                 </li>
-                <li>
-                    Video guides on OctoBot's setup and main features
-                </li>
                 <li>
                     In depth insight regarding OctoBot, its design and philosophy
                 </li>
             </ul>
             <h4>
-                OctoBot documentation
+                OctoBot guides
             </h4>
-            In the <a target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}"> OctoBot documentation</a>, you will find many article on various subjects including:
+            In the <a target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=octobot_help_details"> OctoBot guides</a>, you will find many articles to help you use OctoBot including:
             <ul>
+                <li>
+                    Video guides on OctoBot's setup and main features
+                </li>
                 <li>
                     Different ways to install OctoBot
                 </li>
@@ -69,9 +69,15 @@ <h4>
                 <li>
                     OctoBot usage and interfaces
                 </li>
+                <li>
+                    Supported exchanges
+                </li>
                 <li>
                     Advanced resources on OctoBot architecture, development guides and specific features
                 </li>
+                <li>
+                    OctoBot Script
+                </li>
             </ul>
         </p>
         <p class="help-section">

diff --git a/Services/Interfaces/web_interface/templates/profile.html b/Services/Interfaces/web_interface/templates/profile.html
@@ -401,12 +401,12 @@ <h2>
                         <div class="card-deck config-container">
                     <span class="col-lg-12">
                         {{ m_config_trader_card.config_trader_card(config_trading, "trading", "Trading settings",
-                            link=OCTOBOT_DOCS_URL+"/configuration/profile-configuration#trading") }}
+                            link=OCTOBOT_DOCS_URL+"/octobot-configuration/profile-configuration#trading") }}
                     </span>
                             {{ m_config_trader_card.config_trader_card(config_trader, "trader", "Trader",
-                            link=OCTOBOT_DOCS_URL+"/usage/simulator#real-trader") }}
+                            link=OCTOBOT_DOCS_URL+"/octobot-usage/simulator#real-trader") }}
                             {{ m_config_trader_card.config_trader_card(config_trader_simulator, "trader-simulator",
-                            "Trader simulator", link=OCTOBOT_DOCS_URL+"/usage/simulator",
+                            "Trader simulator", link=OCTOBOT_DOCS_URL+"/octobot-usage/simulator?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=simulator_config",
                             footer_text="Changes in the simulated starting portfolio will reset enabled exchanges simulated portfolio history.") }}
                         </div>
                     </div>

diff --git a/Services/Services_bases/gpt_service/gpt.py b/Services/Services_bases/gpt_service/gpt.py
@@ -265,7 +265,7 @@ def get_required_config(self):
 
     @classmethod
     def get_help_page(cls) -> str:
-        return f"{constants.OCTOBOT_DOCS_URL}/interfaces/chatgpt-interface"
+        return f"{constants.OCTOBOT_DOCS_URL}/octobot-interfaces/chatgpt"
 
     def get_type(self) -> None:
         return services_constants.CONFIG_GPT

diff --git a/Services/Services_bases/reddit_service/reddit.py b/Services/Services_bases/reddit_service/reddit.py
@@ -52,7 +52,7 @@ def get_required_config(self):
 
     @classmethod
     def get_help_page(cls) -> str:
-        return f"{constants.OCTOBOT_DOCS_URL}/interfaces/reddit-interface"
+        return f"{constants.OCTOBOT_DOCS_URL}/octobot-interfaces/reddit"
 
     @staticmethod
     def is_setup_correctly(config):

diff --git a/Services/Services_bases/telegram_api_service/telegram_api.py b/Services/Services_bases/telegram_api_service/telegram_api.py
@@ -69,7 +69,7 @@ def get_read_only_info(self):
 
     @classmethod
     def get_help_page(cls) -> str:
-        return f"{constants.OCTOBOT_DOCS_URL}/interfaces/telegram-interface/telegram-api"
+        return f"{constants.OCTOBOT_DOCS_URL}/octobot-interfaces/telegram/telegram-api"
 
     @staticmethod
     def is_setup_correctly(config):
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ Triggers on a Telegram signal from any channel your personal account joined.

		Signal parsing is configurable according to the name of the channel.

		See [OctoBot docs about Telegram API service](https://www.octobot.info/interfaces/telegram-interface/telegram-api) for more information.
		See [OctoBot docs about Telegram API service](https://www.octobot.cloud/guides/octobot-interfaces/telegram/telegram-api?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=telegramChannelSignalEvaluator) for more information.