Update pot files

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,71 @@
+name: Bug report
+description: Create a report to help us improve
+labels: bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # Stop right now if you're reporting a cheat or security vulnerability!
+
+        **Please read our [Security Policy](https://github.com/multitheftauto/mtasa-blue/security/policy) to learn where to responsibly report security issues. Thank you.**
+
+        This template is only for reporting bugs. If you have a feature request, please use the [feature request template](https://github.com/multitheftauto/mtasa-blue/issues/new?assignees=&labels=enhancement&template=feature_request.yml).
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: Describe the bug
+      description: Please provide a clear and concise description of what the bug is.
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: textarea
+    id: to-reproduce
+    attributes:
+      label: Steps to reproduce
+      description: Please provide clear steps to reproduce the behaviour.
+      placeholder: |
+        1. Go to '...'
+        2. Click on '...'
+        3. Scroll down to '...'
+        4. See error
+    validations:
+      required: true
+  - type: textarea
+    id: version
+    attributes:
+      label: Version
+      description: |
+        Please provide the version of the MTA client and/or server you are running.
+
+        Client: You can open the client console using the `F8` key on your keyboard and using the `ver` command to get the version.
+        Server: You can use the `ver` command in the server console to get the version. 
+
+        If you are running Wine, please say so, and say if you're using Linux or MacOS.
+
+        Which operating system the server is running on, if relevant.
+      placeholder: |
+        Client: v1.5.9-release-21140 (Windows 10, 64-bit)
+        Server: v1.5.9-release-21140 (Debian 10, 64-bit)
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: |
+        If available, please provide any other additional context, such as screenshots or videos, or links to other relevant issues, pull requests or documents that can help others troubleshoot your issue more accurately and efficiently.
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: |
+        Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+
+        **Warning!** Do not post any personal information or sensitive logs here. You are responsible for redacting any personal information from the logs. If you need to post sensitive logs, you can use our [private log uploader](https://upload.mtasa.com/) which will only allow MTA staff to access the file, just paste the link to it here.
+      render: shell
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Security Policy
+      description: By submitting this issue, you express that you have read and understood our [Security Policy](https://github.com/multitheftauto/mtasa-blue/security/policy) and that this issue is not security related.
+      options:
+        - label: I have read and understood the Security Policy and this issue is not security related.
+          required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,44 @@
+name: Feature request
+description: Suggest an idea for this project
+labels: enhancement
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # Stop right now if you're reporting a cheat or security vulnerability!
+
+        **Please read our [Security Policy](https://github.com/multitheftauto/mtasa-blue/security/policy) to learn where to responsibly report security issues. Thank you.**
+
+        This template is only for suggesting features. If you have a bug report, please use the [bug report template](https://github.com/multitheftauto/mtasa-blue/issues/new?assignees=&labels=bug&template=bug_report.yml).
+  - type: textarea
+    id: description
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: |
+        Please provide a clear and concise description of what the problem is. For example: I'm always frustrated when [...]
+  - type: textarea
+    id: solution
+    attributes:
+      label: Describe the solution you'd like
+      description: Please provide a clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Describe alternatives you've considered
+      description: Please provide a clear and concise description of any alternative solutions or features you've considered.
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: |
+        If available, please provide any other additional context, such as screenshots or videos, or links to other relevant issues, pull requests or documents that can help others better understand your request.
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Security Policy
+      description: By submitting this issue, you express that you have read and understood our [Security Policy](https://github.com/multitheftauto/mtasa-blue/security/policy) and that this issue is not about a cheat or security vulnerability.
+      options:
+        - label: I have read and understood the Security Policy and this issue is not about a cheat or security vulnerability.
+          required: true

.github/SECURITY.md

@@ -3,7 +3,7 @@
 Before disclosing a cheat or security vulnerability, please do not try and check that they work
 as they could either result in you getting globally banned or infected by a virus.
 
-Please submit your security vulnerabilities and cheats to our [private bugtracker].
+Please submit your security vulnerabilities and cheats to our [private bugtracker]. Our private bugtracker requires a forum account.
 
 Please do not submit vulnerabilities and cheats publicly, on GitHub or anywhere else.
 

.github/workflows/rebuild-pots.yaml

@@ -1,7 +1,8 @@
 name: 'Rebuild en_US pot files'
 on:
   push:
-    branch: master
+    branches:
+      - master
   workflow_dispatch:
 
 jobs:

Client/cefweb/CWebView.cpp

@@ -54,7 +54,6 @@ void CWebView::Initialise()
     browserSettings.javascript_dom_paste = cef_state_t::STATE_DISABLED;
     browserSettings.webgl = cef_state_t::STATE_ENABLED;
 
-    browserSettings.plugins = cef_state_t::STATE_DISABLED;
     if (!m_bIsLocal)
     {
         bool bEnabledJavascript = g_pCore->GetWebCore()->GetRemoteJavascriptEnabled();

Client/core/CClientVariables.cpp

@@ -350,7 +350,6 @@ void CClientVariables::LoadDefaults()
     DEFAULT("browser_remote_websites", true);                                         // Load remote websites?
     DEFAULT("browser_remote_javascript", true);                                       // Execute javascript on remote websites?
     DEFAULT("filter_duplicate_log_lines", true);                                      // Filter duplicate log lines for debug view and clientscript.log
-    DEFAULT("discord_rich_presence", true);                                           // Enable Discord Game SDK
     DEFAULT("always_show_transferbox", false);            // Should the transfer box always be visible for downloads? (and ignore scripted control)
     DEFAULT("_beta_qc_rightclick_command", _S("reconnect"));            // Command to run when right clicking quick connect (beta - can be removed at any time)
 

Client/core/CConnectManager.cpp

@@ -46,8 +46,7 @@ CConnectManager::~CConnectManager()
     g_pConnectManager = NULL;
 }
 
-bool CConnectManager::Connect(const char* szHost, unsigned short usPort, const char* szNick, const char* szPassword, bool bNotifyServerBrowser,
-                              const char* szSecret)
+bool CConnectManager::Connect(const char* szHost, unsigned short usPort, const char* szNick, const char* szPassword, bool bNotifyServerBrowser)
 {
     assert(szHost);
     assert(szNick);
@@ -101,11 +100,6 @@ bool CConnectManager::Connect(const char* szHost, unsigned short usPort, const c
     m_usPort = usPort;
     m_bSave = true;
 
-    if (szSecret)
-        m_strDiscordSecretJoin = szSecret;
-    else
-        m_strDiscordSecretJoin.clear();
-
     m_strLastHost = m_strHost;
     m_usLastPort = m_usPort;
     m_strLastPassword = m_strPassword;
@@ -495,10 +489,3 @@ void CConnectManager::OpenServerFirewall(in_addr Address, ushort usHttpPort, boo
         g_pCore->GetNetwork()->GetHTTPDownloadManager(EDownloadMode::CONNECT_TCP_SEND)->QueueFile(strDummyUrl, NULL, NULL, NULL, options);
     }
 }
-
-SString CConnectManager::GetJoinSecret()
-{
-    SString dummy = m_strDiscordSecretJoin;
-    m_strDiscordSecretJoin.clear();
-    return dummy;
-}

Client/core/CConnectManager.h

@@ -21,8 +21,7 @@ class CConnectManager
     CConnectManager();
     ~CConnectManager();
 
-    bool Connect(const char* szHost, unsigned short usPort, const char* szNick, const char* szPassword, bool bNotifyServerBrowser = false,
-                 const char* szSecret = nullptr);
+    bool Connect(const char* szHost, unsigned short usPort, const char* szNick, const char* szPassword, bool bNotifyServerBrowser = false);
     bool Reconnect(const char* szHost, unsigned short usPort, const char* szPassword, bool bSave = true);
 
     bool Abort();
@@ -35,8 +34,6 @@ class CConnectManager
 
     static bool StaticProcessPacket(unsigned char ucPacketID, class NetBitStreamInterface& bitStream);
 
-    SString GetJoinSecret();
-
     std::string    m_strLastHost;
     unsigned short m_usLastPort;
     std::string    m_strLastPassword;
@@ -55,7 +52,6 @@ class CConnectManager
     bool           m_bSave;
     time_t         m_tConnectStarted;
     bool           m_bHasTriedSecondConnect;
-    SString        m_strDiscordSecretJoin;
 
     GUI_CALLBACK* m_pOnCancelClick;
 

Client/core/CCore.cpp

@@ -21,7 +21,6 @@
 #include "CModelCacheManager.h"
 #include <SharedUtil.Detours.h>
 #include <ServerBrowser/CServerCache.h>
-#include "CDiscordManager.h"
 
 using SharedUtil::CalcMTASAPath;
 using namespace std;
@@ -46,7 +45,7 @@ static HMODULE WINAPI SkipDirectPlay_LoadLibraryA(LPCSTR fileName)
     return Win32LoadLibraryA("d3d8.dll");
 }
 
-CCore::CCore() : m_DiscordManager(new CDiscordManager())
+CCore::CCore()
 {
     // Initialize the global pointer
     g_pCore = this;
@@ -68,9 +67,6 @@ CCore::CCore() : m_DiscordManager(new CDiscordManager())
     ApplyCoreInitSettings();
     g_pLocalization = new CLocalization;
 
-    // Initialize discord manager
-    m_DiscordManager->Initialize();
-
     // Create a logger instance.
     m_pConsoleLogger = new CConsoleLogger();
 
@@ -589,11 +585,6 @@ void CCore::SetConnected(bool bConnected)
 {
     m_pLocalGUI->GetMainMenu()->SetIsIngame(bConnected);
     UpdateIsWindowMinimized();            // Force update of stuff
-
-    if (bConnected)
-        m_DiscordManager->RegisterPlay(true);
-    else
-        ResetDiscordRichPresence();
 }
 
 bool CCore::IsConnected()
@@ -790,7 +781,6 @@ void CCore::ApplyHooks2()
             CCore::GetSingleton().CreateMultiplayer();
             CCore::GetSingleton().CreateXML();
             CCore::GetSingleton().CreateGUI();
-            CCore::GetSingleton().ResetDiscordRichPresence();
         }
     }
 }
@@ -1995,28 +1985,6 @@ uint CCore::GetMaxStreamingMemory()
     return m_fMaxStreamingMemory;
 }
 
-//
-// ResetDiscordRichPresence
-//
-void CCore::ResetDiscordRichPresence()
-{
-    time_t currentTime;
-    time(&currentTime);
-
-    // Set default parameters
-    SDiscordActivity activity;
-    activity.m_details = "In Main Menu";
-    activity.m_startTimestamp = currentTime;
-
-    m_DiscordManager->UpdateActivity(activity, [](EDiscordRes res) {
-        if (res == DiscordRes_Ok)
-            WriteDebugEvent("[DISCORD]: Rich presence default parameters reset.");
-        else
-            WriteErrorEvent("[DISCORD]: Unable to reset rich presence default parameters.");
-    });
-    m_DiscordManager->RegisterPlay(false);
-}
-
 //
 // OnCrashAverted
 //

Client/core/CCore.h

@@ -101,7 +101,6 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     CLocalizationInterface*   GetLocalization() { return g_pLocalization; };
     CWebCoreInterface*        GetWebCore();
     CTrayIconInterface*       GetTrayIcon() { return m_pTrayIcon; };
-    CDiscordManagerInterface* GetDiscordManager() { return reinterpret_cast<CDiscordManagerInterface*>(m_DiscordManager.get()); }
 
     void SaveConfig(bool bWaitUntilFinished = false);
 
@@ -227,8 +226,6 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     uint GetMinStreamingMemory();
     uint GetMaxStreamingMemory();
 
-    void ResetDiscordRichPresence();
-
     SString GetConnectCommandFromURI(const char* szURI);
     void    GetConnectParametersFromURI(const char* szURI, std::string& strHost, unsigned short& usPort, std::string& strNick, std::string& strPassword);
     bool    bScreenShot;
@@ -298,8 +295,6 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     CWebCoreInterface* m_pWebCore = nullptr;
     CTrayIcon*         m_pTrayIcon;
 
-    std::unique_ptr<class CDiscordManager> m_DiscordManager;
-
     // Hook interfaces.
     CMessageLoopHook*        m_pMessageLoopHook;
     CDirectInputHookManager* m_pDirectInputHookManager;