Merge branch 'master' into master

src-tauri/Cargo.toml

@@ -27,6 +27,7 @@ runas = "1.1.0"
 sysinfo = "0.29.10"
 simple-logging = "2.0.2"
 log = "0.4.20"
+charset-normalizer-rs = "1.0.6"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 dll-syringe = "0.15.2"

src-tauri/src/helpers.rs

@@ -1,28 +1,50 @@
 use chardet::{charset2encoding, detect};
+use charset_normalizer_rs::from_bytes;
 use encoding::label::encoding_from_whatwg_label;
 use encoding::DecoderTrap;
 
-pub fn decode_buffer(buf: Vec<u8>) -> String {
-    let result = detect(&buf);
-    let mut str_encoding = charset2encoding(&result.0);
-    // let's just say it's cp1251 if encoding is not detected
-    // FIXME: find a way to actually detect cp1251 and cp1252 from together
+pub fn decode_buffer(buf: Vec<u8>) -> (String, String, String) {
+    let buff_output: String;
+    let first_encoding: String;
+    let second_encoding: String;
+    let mut str_encoding: String;
 
-    if result.0 == "KOI8-R" && result.1 < 0.7 && result.2 == "Russian" {
-        str_encoding = "cp1251";
+    // chardet
+    first_encoding = charset2encoding(&detect(&buf).0).to_string();
+
+    // charset_normalizer_rs
+    second_encoding = match from_bytes(&buf, None).get_best() {
+        Some(cd) => cd.encoding().to_string(),
+        None => "not_found".to_string(),
+    };
+
+    str_encoding = first_encoding.clone();
+
+    if first_encoding == "KOI8-R"
+        || first_encoding == "MacCyrillic"
+        || first_encoding == "x-mac-cyrillic"
+    {
+        str_encoding = "cp1251".to_string();
     }
 
-    if str_encoding.len() < 1 {
-        str_encoding = "cp1251";
+    if second_encoding == "koi8-r" || second_encoding == "macintosh" || second_encoding == "ibm866"
+    {
+        str_encoding = "cp1251".to_string();
     }
 
-    let coder = encoding_from_whatwg_label(str_encoding);
+    // if str_encoding.len() < 1 {
+    //     str_encoding = "cp1251".to_string();
+    // }
+
+    let coder = encoding_from_whatwg_label(str_encoding.as_str());
     if coder.is_some() {
-        coder
+        buff_output = coder
             .unwrap()
             .decode(&buf, DecoderTrap::Ignore)
-            .expect("Error")
+            .expect("Error");
     } else {
-        String::from_utf8_lossy(buf.as_slice()).to_string()
+        buff_output = String::from_utf8_lossy(buf.as_slice()).to_string();
     }
+
+    (buff_output, first_encoding, second_encoding)
 }

src-tauri/src/main.rs

@@ -78,10 +78,10 @@ async fn ping_server(ip: &str, port: i32) -> Result<u32, String> {
             let before = Instant::now();
             match q.recv().await {
                 Ok(_p) => Ok(before.elapsed().as_millis() as u32),
-                Err(_) => Ok(0),
+                Err(_) => Ok(9999),
             }
         }
-        Err(_) => Ok(0),
+        Err(_) => Ok(9999),
     }
 }
 

src-tauri/src/query.rs

@@ -158,17 +158,17 @@ impl Query {
         let hostname_len = packet.read_u32::<LittleEndian>().unwrap();
         let mut hostname_buf = vec![0u8; hostname_len as usize];
         packet.read_exact(&mut hostname_buf).unwrap();
-        data.hostname = helpers::decode_buffer(hostname_buf);
+        data.hostname = helpers::decode_buffer(hostname_buf).0;
 
         let gamemode_len = packet.read_u32::<LittleEndian>().unwrap();
         let mut gamemode_buf = vec![0u8; gamemode_len as usize];
         packet.read_exact(&mut gamemode_buf).unwrap();
-        data.gamemode = helpers::decode_buffer(gamemode_buf);
+        data.gamemode = helpers::decode_buffer(gamemode_buf).0;
 
         let language_len = packet.read_u32::<LittleEndian>().unwrap();
         let mut language_buf = vec![0u8; language_len as usize];
         packet.read_exact(&mut language_buf).unwrap();
-        data.language = helpers::decode_buffer(language_buf);
+        data.language = helpers::decode_buffer(language_buf).0;
 
         Ok(serde_json::to_string(&data).unwrap())
     }
@@ -184,7 +184,7 @@ impl Query {
             let player_name_len = packet.read_u8().unwrap();
             let mut player_name_buf = vec![0u8; player_name_len as usize];
             packet.read_exact(&mut player_name_buf).unwrap();
-            player.name = helpers::decode_buffer(player_name_buf);
+            player.name = helpers::decode_buffer(player_name_buf).0;
 
             player.score = packet.read_i32::<LittleEndian>().unwrap();
         }
@@ -202,12 +202,12 @@ impl Query {
             let rule_name_len = packet.read_u8().unwrap();
             let mut rule_name_buf = vec![0u8; rule_name_len as usize];
             packet.read_exact(&mut rule_name_buf).unwrap();
-            rule.push(helpers::decode_buffer(rule_name_buf));
+            rule.push(helpers::decode_buffer(rule_name_buf).0);
 
             let rule_value_len = packet.read_u8().unwrap();
             let mut rule_value_buf = vec![0u8; rule_value_len as usize];
             packet.read_exact(&mut rule_value_buf).unwrap();
-            rule.push(helpers::decode_buffer(rule_value_buf));
+            rule.push(helpers::decode_buffer(rule_value_buf).0);
 
             rules.push(rule);
         }

src-tauri/src/samp.rs

@@ -120,30 +120,30 @@ pub fn get_samp_favorite_list() -> String {
             let ip_len = r.read_u32::<LittleEndian>().unwrap();
             let mut pos: u32 = r.position().try_into().unwrap();
             let server_ip = buffer[pos as usize..(pos + ip_len) as usize].to_vec();
-            server_info.ip = helpers::decode_buffer(server_ip);
+            server_info.ip = helpers::decode_buffer(server_ip).0;
             r.set_position((pos + ip_len).try_into().unwrap());
 
             server_info.port = r.read_u32::<LittleEndian>().unwrap();
 
             let name_len = r.read_u32::<LittleEndian>().unwrap();
             pos = r.position().try_into().unwrap();
             let server_name = buffer[pos as usize..(pos + name_len) as usize].to_vec();
-            server_info.name = helpers::decode_buffer(server_name);
+            server_info.name = helpers::decode_buffer(server_name).0;
             r.set_position((pos + name_len).try_into().unwrap());
 
             let password_len = r.read_u32::<LittleEndian>().unwrap();
             if password_len != 0 {
                 pos = r.position().try_into().unwrap();
                 let server_password = buffer[pos as usize..(pos + password_len) as usize].to_vec();
-                server_info.password = helpers::decode_buffer(server_password);
+                server_info.password = helpers::decode_buffer(server_password).0;
                 r.set_position((pos + password_len).try_into().unwrap());
             }
 
             let rcon_len = r.read_u32::<LittleEndian>().unwrap();
             if rcon_len != 0 {
                 pos = r.position().try_into().unwrap();
                 let server_rcon = buffer[pos as usize..(pos + rcon_len) as usize].to_vec();
-                server_info.rcon = helpers::decode_buffer(server_rcon);
+                server_info.rcon = helpers::decode_buffer(server_rcon).0;
                 r.set_position((pos + rcon_len).try_into().unwrap());
             }
 

src/hooks/query.tsx

@@ -1,14 +1,12 @@
 import { useEffect, useRef } from "react";
-import { usePersistentServers, useServers } from "../states/servers";
+import { useServers } from "../states/servers";
 import { queryServer } from "../utils/query";
 import { Server } from "../utils/types";
 
 export const useQuery = () => {
   const queryTimer = useRef<number | undefined>(undefined);
 
-  const { selected, updateServer, setSelected } = useServers();
-  const { updateInFavoritesList, updateInRecentlyJoinedList } =
-    usePersistentServers();
+  const { selected, setSelected } = useServers();
   const selectedServer = useRef<Server | undefined>(selected);
 
   useEffect(() => {
@@ -37,21 +35,7 @@ export const useQuery = () => {
   };
 
   const getServerInfo = (srv: Server) => {
-    queryServer(srv)
-      .then((server) => {
-        if (server && selectedServer.current) {
-          if (
-            server.ip == selectedServer.current.ip &&
-            server.port == selectedServer.current.port
-          ) {
-            updateServer(server);
-            updateInFavoritesList(server);
-            updateInRecentlyJoinedList(server);
-            setSelected(server);
-          }
-        }
-      })
-      .catch((e) => console.log(e));
+    queryServer(srv);
   };
 
   return {

src/locales/index.ts

@@ -4,10 +4,16 @@ import English from "./translations/en";
 import Spanish from "./translations/es";
 import Farsi from "./translations/fa";
 import Filipino from "./translations/fil";
-import France from "./translations/fr";
+import French from "./translations/fr";
+import Hindi from "./translations/hi";
 import Italian from "./translations/it";
+import Portuguese from "./translations/pt";
 import Romanian from "./translations/ro";
 import Arabic from "./translations/ar";
+import Indonesian from "./translations/id";
+import Polish from "./translations/pl";
+import Bosnian from "./translations/bs";
+import Russian from "./translations/ru";
 
 i18n.use(initReactI18next).init({
   // we init with resources
@@ -24,18 +30,36 @@ i18n.use(initReactI18next).init({
     fil: {
       translations: Filipino,
     },
+    fr: {
+      translations: French,
+    },
+    hi: {
+      translations: Hindi,
+    },
     it: {
       translations: Italian,
     },
-    fr: {
-      translations: France,
+    pt: {
+      translations: Portuguese,
     },
     ro: {
       translations: Romanian,
     },
     ar: {
       translations: Arabic,
     },
+    id: {
+      translations: Indonesian,
+    },
+    pl: {
+      translations: Polish,
+    },
+    bs: {
+      translations: Bosnian,
+    },
+    ru: {
+      translations: Russian,
+    },
   },
   fallbackLng: "en",
   debug: true,

src/locales/translations/bs.ts

@@ -0,0 +1,80 @@
+export default {
+  favorites: "Favoriti",
+  internet: "Internet",
+  partners: "Partneri",
+  recently_joined: "Nedavno posjećen",
+  nickname: "Nadimak",
+  settings: "Postavke",
+  minimize: "Minimiziraj",
+  maximize: "Maksimiziraj",
+  close: "Zatvori",
+  add_server_modal_description_1: "Dodaj server ručno na svoju listu favorita.",
+  add_server_modal_description_2: "Primjer: 127.0.0.1:7777",
+  add: "Dodaj",
+  server: "Server",
+  address: "Adresa",
+  players: "Igrači",
+  server_join_prompt_enter_password:
+    "Ovaj server je zaštićen, molimo da unesete lozinku.",
+  server_join_prompt_enter_password_input_placeholder: "Unesi lozinku...",
+  server_join_prompt_nickname_input_placeholder: "Unesi nadimak...",
+  connect: "Konektuj",
+  copy: "Kopiraj",
+  remove_from_favorites: "Izbriši iz Favorita",
+  add_to_favorites: "Dodaj u Favorite",
+  filters: "Filteri",
+  filter_only_omp_servers: "Samo open.mp serveri",
+  filter_non_empty_servers: "Neprazni Serveri",
+  filter_unpassworded_servers: "Serveri bez lozinke",
+  rule: "Pravilo",
+  value: "Vrijednost",
+  player: "Igrač",
+  score: "Rezultat",
+  locked: "Zaključano",
+  unlocked: "Otključano",
+  openmp_server: "open.mp server",
+  name: "Ime",
+  ping: "Ping",
+  mode: "Mode",
+  filter_servers: "Filtriraj Servere",
+  search_for_server_hostname_mode: "Pretraži za ime/mode servera",
+  clear_recently_joined_list: "Izbriši Nedavno Posjećene Servere",
+  refresh_servers: "Osvježi Server Listu",
+  play: "Igraj",
+  remove_selected_server_from_favorites: "Ukloni Izabrani Server iz Favorita",
+  add_selected_server_to_favorites: "Dodaj Izabrani Server u Favorite",
+  add_server: "Dodaj Server",
+  hide_player_and_rule_list: "Sakrij listu igrača i pravila",
+  show_player_and_rule_list: "Prikaži listu igrača i pravila",
+  copy_server_info: "Kopiraj Server Info",
+  settings_gta_path_input_label:
+    "Lokacija GTA: San Andreas-a (gdje je SA-MP također instaliran)",
+  browse: "Pretraži",
+  settings_import_nickname_gta_path_from_samp:
+    "Prenesi nadimak i GTA SA lokaciju iz SA-MP postavki",
+  settings_import_samp_favorite_list:
+    "Prenesi listu favorita iz SA-MP podataka",
+  settings_reset_application_data:
+    "Restartuj podatke aplikacije (očisti postavke i liste)",
+  settings_new_update_available:
+    "⚠ Novo ažuriranje dostupno. Klikni da skineš! ⚠",
+  settings_credits_made_by: "Napravio s ❤️",
+  settings_credits_view_source_on_github: "Pogledaj izvorni kod na GitHub-u",
+  update_modal_update_available_title: "Dostupno ažuriranje!",
+  update_modal_update_available_description:
+    'Dostupan je novi build launcher-a!\nBuild verzija tvoga launhcer-a: {{ version }}\nTrenutna build verzija launcher-a: {{ newVersion }}\nKlikni "Skini" da otvorite stranicu izdanja',
+  download: "Skini",
+  update_modal_remind_me_next_time: "Podjseti Me Slijedeći Put",
+  update_modal_skip_this_update: "Preskoči Ovo Ažuriranje",
+  gta_path_modal_cant_find_game_title: "GTA San Andreas nije pronađen!",
+  gta_path_modal_cant_find_game_description:
+    'GTA San Andreas nije pronađen u ovom direktoriju:\n  - "{{ path }}"\n"gta_sa.exe" nije pronađen u datom direktoriju.',
+  open_settings: "Otvori Postavke",
+  cancel: "Otkaži",
+  gta_path_modal_cant_find_samp_title: "SA-MP nije pronađen!",
+  gta_path_modal_cant_find_samp_description:
+    'SA-MP instalacija nije pronađena u ovom direktoriju:\n  - "{{ path }}"\n"samp.dll" nije pronađen u datom direktoriju.\n\nAko nemaš instaliran SA-MP, možeš ga skinuti sa https://sa-mp.mp/ klikom na **Skini**',
+  notification_add_to_favorites_title: "Dodan u Favorite!",
+  notification_add_to_favorites_description:
+    "{{ server }} je dodan u tvoju listu favorita.",
+};

src/locales/translations/en.ts

@@ -76,4 +76,14 @@ export default {
   notification_add_to_favorites_title: "Added to Favorites!",
   notification_add_to_favorites_description:
     "{{ server }} has been added to your favorite list.",
+  nickname_modal_name_not_set_title: "No Nickname!",
+  nickname_modal_name_not_set_description:
+    "You must choose a nickname for yourself before joining a server.",
+  gta_path_modal_path_not_set_title: "GTA San Andreas path is not set!",
+  gta_path_modal_path_not_set_description:
+    "You didn't set GTA San Andreas path, go to settings and search for game folder.",
+  admin_permissions_required_modal_title: "Admin permissions required!",
+  admin_permissions_required_modal_description:
+    'It seems like your GTA: San Andreas game requires administration permissions to run. This can be due to many causes, like having your game installed in "C" drive. Please re-open open.mp launcher as administrator either using "Run as Admin" button or manually by yourself',
+  run_as_admin: "Run as Admin",
 };

src/locales/translations/fa.ts

@@ -78,4 +78,14 @@ export default {
   notification_add_to_favorites_title: "به مورد علاقه ها اضافه شد!",
   notification_add_to_favorites_description:
     "سرور {{ server }} به لیست مورد علاقه های شما اضافه شدt.",
+  nickname_modal_name_not_set_title: "نام مستعار ندارید!",
+  nickname_modal_name_not_set_description:
+    "قبل از ورود به سرور باید برای خود نام مستعار انتخاب کنید.",
+  gta_path_modal_path_not_set_title: "مسیر GTA San Andreas خالی است!",
+  gta_path_modal_path_not_set_description:
+    "شما مسیر GTA San Andreas را انتخاب نکردید، به تنظیمات برید و حستحو را بزنید.",
+  admin_permissions_required_modal_title: "دسترسی ادمین نیاز است",
+  admin_permissions_required_modal_description:
+    'به نظر میرسد GTA: San Andreas نیاز به دسترسی ادیمن برای اجرا است. این میتواند به چند دلیل باشد، مثال: بازی شما در درایو C نصب شده است. لانچر را با دسترس ادمین باز کنید، یا از دکمه "اجرا توسط ادمین" استفاده کنید.',
+  run_as_admin: "اجرا توسط ادمین",
 };