merge: github.com:onesoft-sudo/sudobot into feature/verification-fp

Signed-off-by: Ar Rakin <[email protected]>

Author: virtual-designer

.github/cra-metadata.json

@@ -1,3 +1,3 @@
 {
-    "lastReadCommit": "752b1ebd34266f6e4be7f309c9a4450a40f617f8"
+    "lastReadCommit": "42feff619909f19482db01fa7b210212a21762fb"
 }

CHANGELOG.md

@@ -1,7 +1,56 @@
 # Changelog
 
+### 05-02-2025 - [[Conventional Release Action](mailto:[email protected])]
+
+  * **release:** v10.45.2 [skip ci]    
+      
+    **Signed-off-by:**  Conventional Release Action <[email protected]>  
+      
+  * **release:** v10.45.1 [skip ci]    
+      
+    **Signed-off-by:**  Conventional Release Action <[email protected]>  
+      
+
+### 05-02-2025 - [[Ar Rakin](mailto:[email protected])]
+
+  * **fix:** wording in the restart command error messages    
+      
+    **Signed-off-by:**  Ar Rakin <[email protected]>  
+  * **fix:** keep base env variables    
+      
+    **Signed-off-by:**  Ar Rakin <[email protected]>  
+  * **fix:** restart command with 2fa     
+      
+    **Signed-off-by:**  Ar Rakin <[email protected]>  
+  * **chore(extensions):** build extensions [skip ci]    
+      
+    **Signed-off-by:**  Ar Rakin <[email protected]>  
+      
+
+### 04-02-2025 - [[Conventional Release Action](mailto:[email protected])]
+
+  * **release:** v10.45.0 [skip ci]    
+      
+    **Signed-off-by:**  Conventional Release Action <[email protected]>  
+      
+
+### 04-02-2025 - [[Ar Rakin](mailto:[email protected])]
+
+  * **feat(security):** two-factor authentication and secret encryption    
+      
+    **Signed-off-by:**  GitHub <[email protected]>  
+      
+
 ### 03-02-2025 - [[Ar Rakin](mailto:[email protected])]
 
+  * **fix:** type import error    
+      
+    **Signed-off-by:**  GitHub <[email protected]>  
+      
+  * **feat(api):** status check    
+      
+    **Signed-off-by:**  GitHub <[email protected]>  
+      
   * merge: branch 'main' of github.com:onesoft-sudo/sudobot    
 
     **Signed-off-by:**  Ar Rakin <[email protected]>  
@@ -25,6 +74,10 @@
 
 ### 03-02-2025 - [[Conventional Release Action](mailto:[email protected])]
 
+  * **release:** v10.43.0 [skip ci]    
+      
+    **Signed-off-by:**  Conventional Release Action <[email protected]>  
+      
   * **release:** v10.42.0 [skip ci]    
 
     **Signed-off-by:**  Conventional Release Action <[email protected]>  

extensions/.extbuilds/index.json

@@ -1,6 +1,6 @@
 {
     "name": "@osn/sudobot",
-    "version": "10.43.0",
+    "version": "10.45.3",
     "exports": "./src/main/typescript/exports.ts",
     "publish": {
         "exclude": [

jsr.json

@@ -1,6 +1,6 @@
 {
     "name": "@osn/sudobot",
-    "version": "10.43.0",
+    "version": "10.45.3",
     "description": "A Discord bot for moderation purposes.",
     "author": {
         "name": "Ar Rakin",

package.json

@@ -135,20 +135,23 @@ class RestartCommand extends Command {
     }
 
     public override async execute(context: Context): Promise<void> {
+        const mfaKey = context.isChatInput() ? context.options.getString("credential_key") : "";
+
+        this.application.logger.debug("Conditions: ", !!getEnvData().TWO_FACTOR_AUTH_URL, !mfaKey);
+        
         if (
             getEnvData().TWO_FACTOR_AUTH_URL &&
-            (!context.isChatInput() || context.options.getString("credential_key"))
+            !mfaKey
         ) {
             await context.error(
                 "Please enter the credential server 2FA code to restart the bot" +
-                    (context.isLegacy() ? " using the slash command" : "") +
+                    (context.isLegacy() ? ", by using the slash command" : "") +
                     "!"
             );
+            
             return;
         }
 
-        const mfaKey = context.isChatInput() ? context.options.getString("credential_key") : "";
-
         const reply = await context.reply({
             embeds: [
                 {

src/main/typescript/commands/settings/RestartCommand.ts

@@ -374,11 +374,15 @@ class DiscordKernel extends Kernel {
                 try {
                     const data = parse(decryptedTextData);
 
+                    setEnvData({
+                        ...process.env,
+                        ...data
+                    } as unknown as Record<string, string | undefined>);
+
                     for (const key in data) {
                         process.env[key] = data[key];
                     }
 
-                    setEnvData(data);
                     this.logger.success("Successfully loaded environment data");
                 } catch (error) {
                     this.logger.error(