Update Settings.js

plugins/MoreAlts/Settings.js

@@ -22,13 +22,15 @@ import {
 const UserStore = findByStoreName("UserStore");
 const TokenManager = findByProps("getToken");
 
+
 if (!storage.accounts) storage.accounts = {};
 if (!storage.accountOrder) storage.accountOrder = [];
 if (!storage.settings) {
   storage.settings = {
     enableCLI: true,
     confirmBeforeDelete: true,
-    enableUnsafeFeatures: false
+    enableUnsafeFeatures: false,
+    addToSidebar: true
   };
 } else {
   
@@ -36,18 +38,20 @@ if (!storage.settings) {
     storage.settings.enableUnsafeFeatures = false;
   }
   if (storage.settings.enableCLI === undefined) {
-    storage.settings.enableCLI = storage.settings.showAccountNames !== false; 
+    storage.settings.enableCLI = storage.settings.showAccountNames !== false;
   }
   if (storage.settings.confirmBeforeDelete === undefined) {
     storage.settings.confirmBeforeDelete = true;
   }
-  
+  if (storage.settings.addToSidebar === undefined) {
+    storage.settings.addToSidebar = true;
+  }
+
   if (storage.settings.showAccountNames !== undefined) {
     delete storage.settings.showAccountNames;
   }
 }
 
-
 addLog('info', 'AccountSwitcher plugin initialized', { 
   accountsCount: Object.keys(storage.accounts).length,
   cliEnabled: storage.settings.enableCLI,
@@ -84,608 +88,7 @@ function SettingsPage({ onBack }) {
   const enableUnsafeFeatures = (value) => {
     if (value) {
       showConfirmationAlert({
-        React.createElement(ReactNative.View, {
-          key: "enable-cli",
-          style: { 
-            flexDirection: 'row', 
-            justifyContent: 'space-between', 
-            alignItems: 'center', 
-            paddingVertical: 12,
-            backgroundColor: '#36393f',
-            paddingHorizontal: 16,
-            borderRadius: 8,
-            marginBottom: 8
-          }
-        }, [
-          React.createElement(ReactNative.Text, {
-            key: "label",
-            style: { color: 'white', fontSize: 16 }
-          }, "Enable CLI Interface"),
-          React.createElement(ReactNative.Switch, {
-            key: "toggle",
-            value: storage.settings.enableCLI,
-            onValueChange: (v) => updateSetting("enableCLI", v),
-            trackColor: { false: '#72767d', true: '#7289da' },
-            thumbColor: 'white'
-          })
-        ]),
-
-        React.createElement(ReactNative.View, {
-          key: "add-to-sidebar",
-          style: { 
-            flexDirection: 'row', 
-            justifyContent: 'space-between', 
-            alignItems: 'center', 
-            paddingVertical: 12,
-            backgroundColor: '#36393f',
-            paddingHorizontal: 16,
-            borderRadius: 8,
-            marginBottom: 8
-          }
-        }, [
-          React.createElement(ReactNative.View, { 
-            key: "text-container", 
-            style: { flex: 1 } 
-          }, [
-            React.createElement(ReactNative.Text, {
-              key: "label",
-              style: { color: 'white', fontSize: 16 }
-            }, "Add to Settings Sidebar"),
-            React.createElement(ReactNative.Text, {
-              key: "desc",
-              style: { color: '#72767d', fontSize: 12, marginTop: 2 }
-            }, "Show Account Switcher in Revenge settings menu")
-          ]),
-          React.createElement(ReactNative.Switch, {
-            key: "toggle",
-            value: storage.settings.addToSidebar,
-            onValueChange: (v) => {
-              updateSetting("addToSidebar", v);
-              if (v) {
-                showToast("Sidebar enabled - restart app to see changes", 0);
-              } else {
-                showToast("Sidebar disabled - restart app to remove", 0);
-              }
-            },
-            trackColor: { false: '#72767d', true: '#7289da' },
-            thumbColor: 'white'
-          })
-        ]),
-
-        React.createElement(ReactNative.View, {
-          key: "confirm-delete",
-          style: { 
-            flexDirection: 'row', 
-            justifyContent: 'space-between', 
-            alignItems: 'center', 
-            paddingVertical: 12,
-            backgroundColor: '#36393f',
-            paddingHorizontal: 16,
-            borderRadius: 8
-          }
-        }, [
-          React.createElement(ReactNative.Text, {
-            key: "label",
-            style: { color: 'white', fontSize: 16 }
-          }, "Confirm Before Delete"),
-          React.createElement(ReactNative.Switch, {
-            key: "toggle",
-            value: storage.settings.confirmBeforeDelete,
-            onValueChange: (v) => updateSetting("confirmBeforeDelete", v),
-            trackColor: { false: '#72767d', true: '#7289da' },
-            thumbColor: 'white'
-          })
-        ])
-      ])
-    ])
-  ]);
-}
-
-export default function AccountsManager(props) {
-  useProxy(storage);
-
-  const [showSettings, setShowSettings] = React.useState(false);
-  const [switchingTo, setSwitchingTo] = React.useState(null);
-  const [showAddDialog, setShowAddDialog] = React.useState(false);
-  const [email, setEmail] = React.useState("");
-  const [password, setPassword] = React.useState("");
-  const [isAddingDynamic, setIsAddingDynamic] = React.useState(false);
-
-  const currentUserId = UserStore.getCurrentUser()?.id;
-
-  const removeAccount = (accountId) => {
-    const account = storage.accounts[accountId];
-    if (!account) return;
-    
-    const isCurrent = accountId === currentUserId;
-    const accountName = account.username;
-    addLog('info', 'Attempting to remove account', { username: accountName, isCurrent });
-
-    const deleteFromStorage = () => {
-      delete storage.accounts[accountId];
-      storage.accountOrder = storage.accountOrder.filter(id => id !== accountId);
-    };
-
-    const removeFromSwitcherOnly = () => {
-      deleteFromStorage();
-      addLog('info', 'Account removed from switcher only', { username: accountName });
-      showToast(`Account ${accountName} removed from switcher`, 0);
-    };
-
-    const logoutAndDelete = async () => {
-      try {
-        addLog('info', 'Starting account removal and logout', { username: accountName });
-        const currentToken = TokenManager.getToken();
-        
-        await findByProps("login", "logout", "switchAccountToken").switchAccountToken(account.token);
-        addLog('debug', 'Switched to account for logout');
-        
-        await findByProps("login", "logout").logout();
-        addLog('debug', 'Account logged out from Discord');
-        
-        setTimeout(async () => {
-          try {
-            await findByProps("login", "logout", "switchAccountToken").switchAccountToken(currentToken);
-            addLog('debug', 'Switched back to original account');
-          } catch (e) {
-            addLog('warn', 'Could not switch back to original account', { error: e.message });
-          }
-        }, 100);
-      } catch (e) {
-        addLog('error', 'Failed to logout account from Discord', { error: e.message });
-        showToast("Failed to logout, but removed from switcher", 1);
-      }
-      
-      deleteFromStorage();
-      addLog('info', 'Account removed and logged out', { username: accountName });
-      showToast(`Account ${accountName} removed and logged out`, 0);
-    };
-
-    if (storage.settings.confirmBeforeDelete) {
-      ReactNative.Alert.alert(
-        isCurrent ? "Remove Current Account" : "Remove Account",
-        isCurrent 
-          ? "Do you want to remove the current account from the switcher? (To logout, use Force Logout in settings)" 
-          : `What do you want to do with ${accountName}?`,
-        [
-          { text: "Cancel", style: "cancel" },
-          { text: "Delete from switcher only", onPress: removeFromSwitcherOnly },
-          !isCurrent && { text: "Delete and logout", onPress: logoutAndDelete },
-        ].filter(Boolean)
-      );
-    } else {
-      if (isCurrent) {
-        removeFromSwitcherOnly();
-      } else {
-        logoutAndDelete();
-      }
-    }
-  };
-
-  const switchToAccount = async (accountId) => {
-    const account = storage.accounts[accountId];
-    if (!account) return;
-    setSwitchingTo(accountId);
-    
-    addLog('info', 'Starting account switch', { username: account.username });
-    
-    try {
-      showToast(`Switching to ${account.username}...`, 0);
-      await findByProps("login", "logout", "switchAccountToken").switchAccountToken(account.token);
-      addLog('info', 'Account switch successful', { username: account.username });
-      showToast(`Switched to ${account.username}!`, 0);
-    } catch (e) {
-      addLog('error', 'Account switch failed', { username: account.username, error: e.message });
-      console.error("Switch error:", e);
-      showToast(`Failed to switch: ${e.message}`, 1);
-    }
-    setSwitchingTo(null);
-  };
-
-  const copyToken = (accountId) => {
-    if (!storage.settings.enableUnsafeFeatures) return;
-    const account = storage.accounts[accountId];
-    if (!account) return;
-    
-    clipboard.setString(account.token);
-    addLog('info', 'Token copied to clipboard', { username: account.username });
-    showToast(`Token for ${account.username} copied`, 0);
-  };
-
-  const addCurrentAccount = async () => {
-    setIsAddingDynamic(true);
-    addLog('info', 'Adding current account');
-    
-    try {
-      const token = TokenManager.getToken();
-      const currentUser = UserStore.getCurrentUser();
-      
-      if (!currentUser || storage.accounts[currentUser.id]) {
-        const message = storage.accounts[currentUser.id] ? "Current account already saved" : "Failed to get current user";
-        addLog('warn', message, { userId: currentUser?.id });
-        showToast(message, 1);
-        setIsAddingDynamic(false);
-        return;
-      }
-
-      const newAccount = {
-        id: currentUser.id,
-        username: currentUser.username,
-        discriminator: currentUser.discriminator,
-        avatar: currentUser.avatar,
-        displayName: currentUser.globalName || currentUser.username,
-        token: token,
-        addedAt: Date.now()
-      };
-
-      storage.accounts[currentUser.id] = newAccount;
-      if (!storage.accountOrder.includes(currentUser.id)) {
-        storage.accountOrder.push(currentUser.id);
-      }
-
-      setShowAddDialog(false);
-      addLog('info', 'Current account added successfully', { username: currentUser.username });
-      showToast(`Current account ${currentUser.username} added!`, 0);
-    } catch (e) {
-      addLog('error', 'Failed to add current account', { error: e.message });
-      console.error("Add current account error:", e);
-      showToast("Failed to add current account", 1);
-    }
-    setIsAddingDynamic(false);
-  };
-
-  const addAccountWithCredentialsHandler = async () => {
-    await addAccountWithCredentials(storage, email, password, setEmail, setPassword, setShowAddDialog, setIsAddingDynamic);
-  };
-
-  const formatDate = (timestamp) => {
-    const date = new Date(timestamp);
-    return date.toLocaleDateString('en-US', { 
-      month: 'short', 
-      day: 'numeric', 
-      year: 'numeric' 
-    });
-  };
-
-  const orderedAccounts = storage.accountOrder
-    .filter(id => storage.accounts[id])
-    .map(id => storage.accounts[id]);
-
-  if (showSettings) {
-    return React.createElement(SettingsPage, {
-      onBack: () => setShowSettings(false)
-    });
-  }
-
-  if (showAddDialog) {
-    return React.createElement(ReactNative.View, {
-      style: { flex: 1, backgroundColor: '#2f3136' }
-    }, [
-      React.createElement(ReactNative.View, {
-        key: "add-header",
-        style: {
-          flexDirection: 'row',
-          alignItems: 'center',
-          padding: 16,
-          backgroundColor: '#202225',
-          borderBottomWidth: 1,
-          borderBottomColor: '#40444b'
-        }
-      }, [
-        React.createElement(ReactNative.TouchableOpacity, {
-          key: "back",
-          onPress: () => {
-            setShowAddDialog(false);
-            setEmail("");
-            setPassword("");
-          },
-          style: { marginRight: 16 }
-        }, React.createElement(ReactNative.Text, {
-          style: { color: '#7289da', fontSize: 16 }
-        }, "← Back")),
-        React.createElement(ReactNative.Text, {
-          key: "title",
-          style: { color: 'white', fontSize: 18, fontWeight: 'bold' }
-        }, "Add Account")
-      ]),
-
-      React.createElement(ReactNative.ScrollView, {
-        key: "add-content",
-        style: { flex: 1 },
-        contentContainerStyle: { padding: 16, paddingBottom: 100 }
-      }, [
-        React.createElement(ReactNative.Text, {
-          key: "instruction",
-          style: { color: '#b9bbbe', fontSize: 16, marginBottom: 20, textAlign: 'center' }
-        }, "Enter your Discord account credentials or add your current account"),
-        
-        React.createElement(ReactNative.TextInput, {
-          key: "email-input",
-          placeholder: "Email address",
-          placeholderTextColor: '#72767d',
-          value: email,
-          onChangeText: setEmail,
-          keyboardType: "email-address",
-          autoCapitalize: "none",
-          style: {
-            backgroundColor: '#40444b',
-            color: 'white',
-            padding: 16,
-            borderRadius: 8,
-            marginBottom: 12,
-            fontSize: 16
-          }
-        }),
-
-        React.createElement(ReactNative.TextInput, {
-          key: "password-input",
-          placeholder: "Password",
-          placeholderTextColor: '#72767d',
-          value: password,
-          onChangeText: setPassword,
-          secureTextEntry: true,
-          style: {
-            backgroundColor: '#40444b',
-            color: 'white',
-            padding: 16,
-            borderRadius: 8,
-            marginBottom: 20,
-            fontSize: 16
-          }
-        }),
-        
-        React.createElement(ReactNative.TouchableOpacity, {
-          key: "login-btn",
-          onPress: addAccountWithCredentialsHandler,
-          disabled: isAddingDynamic,
-          style: {
-            backgroundColor: isAddingDynamic ? '#5c6bc0' : '#7289da',
-            paddingVertical: 16,
-            paddingHorizontal: 20,
-            borderRadius: 8,
-            alignItems: 'center',
-            marginBottom: 12,
-            opacity: isAddingDynamic ? 0.6 : 1
-          }
-        }, React.createElement(ReactNative.Text, {
-          style: { color: 'white', fontSize: 18, fontWeight: 'bold' }
-        }, isAddingDynamic ? "Adding Account..." : "Add Account with Email & Password")),
-
-        React.createElement(ReactNative.View, {
-          key: "divider",
-          style: {
-            height: 1,
-            backgroundColor: '#40444b',
-            marginVertical: 16
-          }
-        }),
-
-        React.createElement(ReactNative.TouchableOpacity, {
-          key: "add-current-btn",
-          onPress: addCurrentAccount,
-          disabled: isAddingDynamic,
-          style: {
-            backgroundColor: isAddingDynamic ? '#5c6bc0' : '#43b581',
-            paddingVertical: 16,
-            paddingHorizontal: 20,
-            borderRadius: 8,
-            alignItems: 'center',
-            opacity: isAddingDynamic ? 0.6 : 1
-          }
-        }, React.createElement(ReactNative.Text, {
-          style: { color: 'white', fontSize: 18, fontWeight: 'bold' }
-        }, isAddingDynamic ? "Adding..." : "Add Current Account"))
-      ])
-    ]);
-  }
-
-  return React.createElement(ReactNative.View, {
-    style: { flex: 1, backgroundColor: '#2f3136' }
-  }, [
-    React.createElement(ReactNative.View, {
-      key: "header",
-      style: {
-        flexDirection: 'row',
-        alignItems: 'center',
-        justifyContent: 'space-between',
-        padding: 16,
-        backgroundColor: '#202225',
-        borderBottomWidth: 1,
-        borderBottomColor: '#40444b'
-      }
-    }, [
-      React.createElement(ReactNative.Text, {
-        key: "title",
-        style: { color: 'white', fontSize: 20, fontWeight: 'bold' }
-      }, "Account Switcher"),
-      React.createElement(ReactNative.TouchableOpacity, {
-        key: "settings-btn",
-        onPress: () => setShowSettings(true),
-        style: {
-          padding: 8,
-          borderRadius: 6,
-          backgroundColor: '#4f545c'
-        }
-      }, React.createElement(ReactNative.Text, {
-        style: { color: 'white', fontSize: 18 }
-      }, "⚙️"))
-    ]),
-
-    React.createElement(ReactNative.View, {
-      key: "accounts-section",
-      style: { flex: 1, padding: 16 }
-    }, [
-      React.createElement(ReactNative.Text, {
-        key: "section-title",
-        style: { color: '#b9bbbe', fontSize: 14, fontWeight: 'bold', marginBottom: 12 }
-      }, `SAVED ACCOUNTS (${orderedAccounts.length})`),
-
-      orderedAccounts.length === 0 
-        ? React.createElement(ReactNative.View, {
-            key: "empty",
-            style: { 
-              alignItems: 'center', 
-              justifyContent: 'center', 
-              paddingVertical: 40 
-            }
-          }, [
-            React.createElement(ReactNative.Text, {
-              key: "empty-text",
-              style: { color: '#72767d', fontSize: 16, marginBottom: 8 }
-            }, "No accounts saved yet"),
-            React.createElement(ReactNative.Text, {
-              key: "empty-hint",
-              style: { color: '#72767d', fontSize: 14, textAlign: 'center' }
-            }, "Access the switcher by pressing the logout button on the main settings page.")
-          ])
-        : React.createElement(ReactNative.ScrollView, {
-            key: "accounts-scroll",
-            style: { flex: 1 },
-            contentContainerStyle: { paddingBottom: 100 }
-          }, orderedAccounts.map((account, index) => {
-            const isCurrent = account.id === currentUserId;
-            const isSwitching = switchingTo === account.id;
-            
-            let avatarUrl = `https://cdn.discordapp.com/embed/avatars/1.png`;
-            if (account.avatar) {
-              avatarUrl = `https://cdn.discordapp.com/avatars/${account.id}/${account.avatar}.png?size=48`;
-            }
-
-            return React.createElement(ReactNative.View, {
-              key: account.id,
-              style: {
-                flexDirection: 'row',
-                alignItems: 'center',
-                backgroundColor: isCurrent ? '#7289da20' : '#36393f',
-                borderWidth: isCurrent ? 2 : 0,
-                borderColor: '#7289da',
-                borderRadius: 12,
-                padding: 12,
-                marginBottom: 12
-              }
-            }, [
-              React.createElement(ReactNative.TouchableOpacity, {
-                key: "avatar",
-                onPress: () => switchToAccount(account.id),
-                disabled: isCurrent || isSwitching,
-                style: { marginRight: 12 }
-              }, React.createElement(ReactNative.Image, {
-                source: { uri: avatarUrl },
-                style: {
-                  width: 48,
-                  height: 48,
-                  borderRadius: 24,
-                  opacity: (isCurrent || isSwitching) ? 0.7 : 1
-                }
-              })),
-
-              React.createElement(ReactNative.View, {
-                key: "info",
-                style: { flex: 1 }
-              }, [
-                React.createElement(ReactNative.Text, {
-                  key: "name",
-                  style: { color: 'white', fontSize: 16, fontWeight: 'bold' }
-                }, `${index + 1}. ${storage.settings.enableCLI ? `${account.username}${account.discriminator !== "0" ? `#${account.discriminator}` : ''}` : account.displayName}`),
-                React.createElement(ReactNative.Text, {
-                  key: "status",
-                  style: { 
-                    color: isCurrent ? '#43b581' : '#72767d', 
-                    fontSize: 12,
-                    marginTop: 2
-                  }
-                }, isCurrent ? "✓ Current Account" : 
-                   isSwitching ? "Switching..." : 
-                   "Tap avatar to switch"),
-                React.createElement(ReactNative.Text, {
-                  key: "date",
-                  style: {
-                    color: '#72767d',
-                    fontSize: 11,
-                    marginTop: 2
-                  }
-                }, `Added: ${formatDate(account.addedAt || Date.now())}`)
-              ]),
-
-              React.createElement(ReactNative.View, {
-                key: "actions",
-                style: { flexDirection: 'column', alignItems: 'flex-end' }
-              }, [
-                storage.settings.enableUnsafeFeatures && React.createElement(ReactNative.TouchableOpacity, {
-                  key: "copy",
-                  onPress: () => copyToken(account.id),
-                  style: {
-                    backgroundColor: '#4f545c',
-                    paddingHorizontal: 12,
-                    paddingVertical: 6,
-                    borderRadius: 6,
-                    minWidth: 80,
-                    alignItems: 'center',
-                    marginBottom: 6
-                  }
-                }, React.createElement(ReactNative.Text, {
-                  style: { color: 'white', fontSize: 12, fontWeight: 'bold' }
-                }, "Copy Token")),
-
-                React.createElement(ReactNative.TouchableOpacity, {
-                  key: "remove",
-                  onPress: () => removeAccount(account.id),
-                  style: {
-                    backgroundColor: '#f04747',
-                    paddingHorizontal: 12,
-                    paddingVertical: 6,
-                    borderRadius: 6,
-                    minWidth: 80,
-                    alignItems: 'center'
-                  }
-                }, React.createElement(ReactNative.Text, {
-                  style: { color: 'white', fontSize: 12, fontWeight: 'bold' }
-                }, "Remove"))
-              ])
-            ]);
-          }))
-    ]),
-
-    React.createElement(ReactNative.View, {
-      key: "bottom-actions",
-      style: {
-        position: 'absolute',
-        bottom: 0,
-        left: 0,
-        right: 0,
-        backgroundColor: '#202225',
-        borderTopWidth: 1,
-        borderTopColor: '#40444b',
-        paddingVertical: 12,
-        paddingHorizontal: 16,
-        paddingBottom: 40
-      }
-    }, React.createElement(ReactNative.TouchableOpacity, {
-      key: "add",
-      onPress: () => setShowAddDialog(true),
-      style: {
-        backgroundColor: '#7289da',
-        paddingVertical: 16,
-        paddingHorizontal: 20,
-        borderRadius: 8,
-        alignItems: 'center',
-        flexDirection: 'row',
-        justifyContent: 'center'
-      }
-    }, [
-      React.createElement(ReactNative.Text, {
-        key: "add-icon",
-        style: { color: 'white', fontSize: 20, marginRight: 8 }
-      }, "+"),
-      React.createElement(ReactNative.Text, {
-        key: "add-text",
-        style: { color: 'white', fontSize: 18, fontWeight: 'bold' }
-      }, "Add Account")
-    ]))
-  ]);
-}
-
-export { addLog };title: "⚠️ Enable Unsafe Features - Security Warning",
+        title: "⚠️ Enable Unsafe Features - Security Warning",
         content: "Unsafe features include token copying, manual token adding, and detailed logging. These features can compromise your account security if misused. Tokens provide full access to accounts and should never be shared. Only enable if you understand the security implications.",
         confirmText: "I Understand - Enable",
         cancelText: "Cancel",
@@ -697,7 +100,7 @@ export { addLog };title: "⚠️ Enable Unsafe Features - Security Warning",
     }
   };
 
-  // Password dialog handlers
+  
   const handlePasswordCancel = () => {
     setShowPasswordDialog(null);
   };