remove discord-rpc stuff in favor of client mod

Author: AmyrAhmady

src-tauri/Cargo.lock

@@ -22,7 +22,6 @@ chardet = "0.2.4"
 chardetng = "0.1.17"
 encoding_rs = "0.8.34"
 dirs-next = "2.0.0"
-discord-rich-presence = "0.2.4"
 regex = "1.10.5"
 runas = "1.2.0"
 sysinfo = "0.30.13"

src-tauri/Cargo.toml

@@ -14,9 +14,8 @@ pub async fn inject(
     dll: &str,
     omp_file: &str,
     password: &str,
-    discord: bool,
 ) -> std::result::Result<(), String> {
-    match injector::run_samp(name, ip, port, exe, dll, omp_file, password, discord).await {
+    match injector::run_samp(name, ip, port, exe, dll, omp_file, password).await {
         Ok(_) => Ok(()),
         Err(e) => {
             log::warn!("{}", e);

src-tauri/src/commands.rs

@@ -17,7 +17,6 @@ pub async fn run_samp(
     _dll_path: &str,
     _omp_file: &str,
     _password: &str,
-    _discord: bool,
 ) -> Result<()> {
     Ok(())
 }
@@ -31,7 +30,6 @@ pub async fn run_samp(
     dll_path: &str,
     omp_file: &str,
     password: &str,
-    discord: bool,
 ) -> Result<()> {
     // Prepare the command to spawn the executable
     let mut cmd = Command::new(format!("{}/{}", executable_dir, GTA_SA_EXECUTABLE));
@@ -49,10 +47,6 @@ pub async fn run_samp(
         ready_for_exec = ready_for_exec.arg("-z").arg(password);
     }
 
-    if discord {
-        ready_for_exec = ready_for_exec.arg("--discord");
-    }
-
     let process = ready_for_exec.current_dir(executable_dir).spawn();
 
     match process {

src-tauri/src/injector.rs

@@ -125,7 +125,6 @@ async fn handle_cli_args() -> Result<()> {
                     &format!("{}/{}", gamepath, SAMP_DLL),
                     &omp_client_path,
                     &password,
-                    true,
                 )
                 .await
                 .map_err(|e| LauncherError::InternalError(e.to_string()))?;

src-tauri/src/main.rs

@@ -1,8 +1,6 @@
 import { t } from "i18next";
-import { Pressable, StyleSheet, TouchableOpacity, View } from "react-native";
-import CheckBox from "../../../components/CheckBox";
+import { StyleSheet, TouchableOpacity, View } from "react-native";
 import Text from "../../../components/Text";
-import { useGenericPersistentState } from "../../../states/genericStates";
 import { useTheme } from "../../../states/theme";
 import {
   exportFavoriteListFile,
@@ -12,8 +10,6 @@ import { sc } from "../../../utils/sizeScaler";
 
 const Advanced = () => {
   const { theme } = useTheme();
-  const { shouldUpdateDiscordStatus, toggleDiscordStatus } =
-    useGenericPersistentState();
   return (
     <View
       style={{
@@ -31,25 +27,6 @@ const Advanced = () => {
           marginTop: sc(10),
         }}
       >
-        <Pressable
-          style={{
-            flexDirection: "row",
-            alignItems: "center",
-          }}
-          onPress={async () => {
-            toggleDiscordStatus(!shouldUpdateDiscordStatus);
-          }}
-        >
-          <CheckBox
-            value={shouldUpdateDiscordStatus}
-            style={{ marginRight: sc(7) }}
-          />
-          <Text semibold color={theme.textPrimary} size={2}>
-            {`${t("settings_advanced_discord_status")} ${t(
-              "settings_advanced_discord_status_requires_restart"
-            )}`}
-          </Text>
-        </Pressable>
         <TouchableOpacity
           style={[
             styles.importButton,

src/containers/Settings/Tab/Advanced.tsx

@@ -41,22 +41,17 @@ const useGenericTempState = create<GenericTempStates>()((set, get) => ({
 interface GenericPersistentStates {
   sideLists: boolean;
   language: LanguageType;
-  shouldUpdateDiscordStatus: boolean;
   showSideLists: (show: boolean) => void;
   setLanguage: (lang: LanguageType) => void;
-  toggleDiscordStatus: (toggle: boolean) => void;
 }
 
 const useGenericPersistentState = create<GenericPersistentStates>()(
   persist(
     (set) => ({
       sideLists: true,
       language: "en",
-      shouldUpdateDiscordStatus: true,
       showSideLists: (show: boolean) => set(() => ({ sideLists: show })),
       setLanguage: (lang) => set(() => ({ language: lang })),
-      toggleDiscordStatus: (toggle) =>
-        set(() => ({ shouldUpdateDiscordStatus: toggle })),
     }),
     {
       name: "generic-state-storage",

src/states/genericStates.ts

@@ -8,7 +8,6 @@ import {
   ResourceInfo,
   validFileChecksums,
 } from "../constants/app";
-import { useGenericPersistentState } from "../states/genericStates";
 import { useJoinServerPrompt } from "../states/joinServerPrompt";
 import { useMessageBox } from "../states/messageModal";
 import { useNotification } from "../states/notification";
@@ -72,7 +71,6 @@ export const startGame = async (
   const { sampVersion } = useSettings.getState();
   const { showPrompt, setServer } = useJoinServerPrompt.getState();
   const { setSelected } = useServers.getState();
-  const { shouldUpdateDiscordStatus } = useGenericPersistentState.getState();
 
   if (IN_GAME) {
     invoke("send_message_to_game", {
@@ -218,7 +216,6 @@ export const startGame = async (
     dll: ourSAMPDllPath,
     ompFile: await getLocalPath("omp", "omp-client.dll"),
     password,
-    discord: shouldUpdateDiscordStatus,
   })
     .then(() => {
       addToRecentlyJoined(server);