From 66c81b8e436df0620633a45a30be1cf8037180b2 Mon Sep 17 00:00:00 2001 From: IRCF Date: Sat, 11 May 2024 10:04:05 +0330 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=96=200.3.0-beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SECURITY.md | 6 +-- package.json | 2 +- release/app/package.json | 2 +- src/defaultSettings.ts | 2 +- src/locale/cn.json | 2 +- src/locale/en.json | 2 +- src/locale/ru.json | 2 +- src/main/lib/proxy.ts | 14 +++++- src/main/main.ts | 52 +++++++++++------------ src/renderer/App.tsx | 1 - src/renderer/components/Modal/License.tsx | 4 +- src/renderer/components/Modal/Restore.tsx | 26 ++++++------ src/renderer/index.tsx | 4 +- src/renderer/lib/loaders.ts | 4 +- src/renderer/lib/toasts.tsx | 8 ++-- src/renderer/pages/About.tsx | 7 ++- src/renderer/pages/Debug.tsx | 4 +- src/renderer/pages/Index.tsx | 8 ++-- src/renderer/pages/Options.tsx | 20 ++++----- src/renderer/pages/Settings.tsx | 8 +++- 20 files changed, 90 insertions(+), 88 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index d420ab91..6a6637b6 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -3,8 +3,8 @@ اپ متن‌باز Oblivion به‌عنوان یکی‌از امن‌ترین و مطمئن‌ترین VPNها، در روزهای پراختلال اخیر نقش مهمی برای دسترسی آزاد کاربران ایرانی به اینترنت ایفا کرده. -- اپ‌های Oblivion و Oblivion Deskop و همینطور هسته Warp-Plus متن‌باز هستن و سورسشون در گیت‌هاب قرار گرفته، ضمن اینکه - بیلد پروژه‌ها به‌صورت خودکار توسط گیت‌هاب اکشن انجام می‌شن. -- وارپ به‌وسیله رمزنگاری مقدار بیشتری از ترافیک خروجی از دستگاهتون، اجازه نمیده هیچ‌کس در کار شما سرک بکشه. +- اپ‌های Oblivion و Oblivion Deskop و همینطور هسته Warp-Plus متن‌باز هستن و سورسشون در گیت‌هاب قرار گرفته، ضمن اینکه + بیلد پروژه‌ها به‌صورت خودکار توسط گیت‌هاب اکشن انجام می‌شن. +- وارپ به‌وسیله رمزنگاری مقدار بیشتری از ترافیک خروجی از دستگاهتون، اجازه نمیده هیچ‌کس در کار شما سرک بکشه. ![virustotal.jpg](screenshot/virustotal.jpg) diff --git a/package.json b/package.json index a468b21a..eccd1203 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "url": "https://github.com/bepass-org/oblivion-desktop/issues", "email": "ircfspace@gmail.com" }, - "version": "0.2.52-beta", + "version": "0.3.0-beta", "license": "Restrictive", "main": "./src/main/main.ts", "scripts": { diff --git a/release/app/package.json b/release/app/package.json index 458df4ce..6f9dc355 100644 --- a/release/app/package.json +++ b/release/app/package.json @@ -1,7 +1,7 @@ { "name": "oblivion-desktop", "description": "unofficial desktop version of oblivion", - "version": "0.2.52-beta", + "version": "0.3.0-beta", "homepage": "https://github.com/bepass-org/oblivion-desktop#readme", "license": "Restrictive", "author": "ircfspace+kiomarzsss (https://ircf.space/)", diff --git a/src/defaultSettings.ts b/src/defaultSettings.ts index 71fedfb9..77ba3627 100644 --- a/src/defaultSettings.ts +++ b/src/defaultSettings.ts @@ -75,4 +75,4 @@ export const languages: { value: string; label: string }[] = [ { value: 'en', label: 'English' }, { value: 'cn', label: 'Chinese' }, { value: 'ru', label: 'Russian' } -]; \ No newline at end of file +]; diff --git a/src/locale/cn.json b/src/locale/cn.json index 3415ebac..cb35ec5e 100644 --- a/src/locale/cn.json +++ b/src/locale/cn.json @@ -92,4 +92,4 @@ "desc": "该程序是 Windows、Linux 和 Mac 的 Oblivion 应用的非官方但可靠版本。\nOblivion Desktop 程序的用户界面是根据由 Youssef Ghobadi 开发的原始版本的用户界面进行建模的。它是为了免费访问互联网而编写的，不允许更改名称或商业使用。", "slogan": "互联网，为所有人或无人！" } -} \ No newline at end of file +} diff --git a/src/locale/en.json b/src/locale/en.json index d72495c2..6db2adcc 100644 --- a/src/locale/en.json +++ b/src/locale/en.json @@ -92,4 +92,4 @@ "desc": "This program is an unofficial, but reliable version of the Oblivion app for Windows, Linux, and Mac.\nThe Oblivion Desktop program is modeled after the user interface of the original version developed by Youssef Ghobadi. It was written, it was prepared for the purpose of free access to the Internet, and any name change or commercial use of it is not allowed.", "slogan": "Internet, for all or none!" } -} \ No newline at end of file +} diff --git a/src/locale/ru.json b/src/locale/ru.json index c00a9df6..0473a2c5 100644 --- a/src/locale/ru.json +++ b/src/locale/ru.json @@ -92,4 +92,4 @@ "desc": "Эта программа является неофициальной, но надежной версией приложения Oblivion для Windows, Linux и Mac.\nПрограмма Oblivion Desktop создана по образу и подобию пользовательского интерфейса оригинальной версии, разработанной Юсефом Гобади. Она была написана с целью обеспечить свободный доступ в Интернет, и любое изменение имени или коммерческое использование запрещено.", "slogan": "Интернет, для всех или никого!" } -} \ No newline at end of file +} diff --git a/src/main/lib/proxy.ts b/src/main/lib/proxy.ts index 5a145a85..cffac764 100644 --- a/src/main/lib/proxy.ts +++ b/src/main/lib/proxy.ts @@ -89,8 +89,18 @@ export const enableProxy = async (ipcEvent?: IpcMainEvent) => { } else if (process.platform === 'darwin') { return new Promise(async (resolve, reject) => { try { - await macOSProxySettings(['-setwebproxy', 'Wi-Fi', hostIP.toString(), port.toString()]); - await macOSProxySettings(['-setsecurewebproxy', 'Wi-Fi', hostIP.toString(), port.toString()]); + await macOSProxySettings([ + '-setwebproxy', + 'Wi-Fi', + hostIP.toString(), + port.toString() + ]); + await macOSProxySettings([ + '-setsecurewebproxy', + 'Wi-Fi', + hostIP.toString(), + port.toString() + ]); resolve(); } catch (error) { reject(error); diff --git a/src/main/main.ts b/src/main/main.ts index a347eff9..38848ca6 100644 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -224,33 +224,33 @@ if (!gotTheLock) { }, // TODO /*{ label: '', type: 'separator' }, - { - label: 'حالت پروکسی', - submenu: [ - { label: 'متصل است', type: 'radio' }, - { label: 'عدم اتصال', type: 'radio' } - ] - }, - { label: '', type: 'separator' }, - { - label: 'Proxy Mode', - submenu: [ - { - label: 'Set System Proxy', - type: 'normal', - click: async () => { - await enableProxy(); - } - }, - { - label: 'Disable', - type: 'normal', - click: async () => { - await disableProxy(); + { + label: 'حالت پروکسی', + submenu: [ + { label: 'متصل است', type: 'radio' }, + { label: 'عدم اتصال', type: 'radio' } + ] + }, + { label: '', type: 'separator' }, + { + label: 'Proxy Mode', + submenu: [ + { + label: 'Set System Proxy', + type: 'normal', + click: async () => { + await enableProxy(); + } + }, + { + label: 'Disable', + type: 'normal', + click: async () => { + await disableProxy(); + } } - } - ] - },*/ + ] + },*/ { label: '', type: 'separator' }, { label: 'Exit', diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx index 0af1aec9..49bbec3e 100644 --- a/src/renderer/App.tsx +++ b/src/renderer/App.tsx @@ -20,7 +20,6 @@ import { loadLang, loadTheme } from './lib/loaders'; import { quitOnCtrlW } from './lib/utils'; export default function App() { - useEffect(() => { openDevtoolsOnCtrlShiftI(); loadTheme(); diff --git a/src/renderer/components/Modal/License.tsx b/src/renderer/components/Modal/License.tsx index 6bd2fb75..192d6007 100644 --- a/src/renderer/components/Modal/License.tsx +++ b/src/renderer/components/Modal/License.tsx @@ -41,9 +41,7 @@ export default function LicenseModal({

{title}

-

- {appLang?.modal?.license_desc} -

+

{appLang?.modal?.license_desc}

{title}

-

- {appLang?.modal?.restore_desc} -

+

{appLang?.modal?.restore_desc}

{appLang?.modal?.cancel} diff --git a/src/renderer/index.tsx b/src/renderer/index.tsx index 127d63fc..0873641b 100644 --- a/src/renderer/index.tsx +++ b/src/renderer/index.tsx @@ -4,9 +4,7 @@ import { ipcRenderer } from './lib/utils'; const container = document.getElementById('root') as HTMLElement; const root = createRoot(container); -root.render( - -); +root.render(); // calling IPC exposed from preload script ipcRenderer.on('ipc-example', (arg) => { diff --git a/src/renderer/lib/loaders.ts b/src/renderer/lib/loaders.ts index f1c2d83e..6ff4a8c0 100644 --- a/src/renderer/lib/loaders.ts +++ b/src/renderer/lib/loaders.ts @@ -16,7 +16,7 @@ export const loadLang = () => { settings.get('lang').then((value) => { let langData = {}; let langDir = 'ltr'; - const key = (typeof value !== 'undefined' ? value : defaultSettings.lang); + const key = typeof value !== 'undefined' ? value : defaultSettings.lang; if (key === 'fa') { langData = fa; langDir = 'rtl'; @@ -37,4 +37,4 @@ export const getLang = () => { const lang = localStorage.getItem('OBLIVION_LANG'); if (!lang || typeof lang === 'undefined') return {}; return JSON.parse(String(lang)); -}; \ No newline at end of file +}; diff --git a/src/renderer/lib/toasts.tsx b/src/renderer/lib/toasts.tsx index fdff9928..596f1528 100644 --- a/src/renderer/lib/toasts.tsx +++ b/src/renderer/lib/toasts.tsx @@ -45,9 +45,9 @@ export const checkInternetToast = () => { }; export const settingsHaveChangedToast = ({ - isConnected, - isLoading - }: { + isConnected, + isLoading +}: { isConnected: boolean; isLoading: boolean; }) => { @@ -70,4 +70,4 @@ export const loadingToast = () => { duration: Infinity, style: defaultToastStyle }); -}; \ No newline at end of file +}; diff --git a/src/renderer/pages/About.tsx b/src/renderer/pages/About.tsx index 8945471d..22687704 100644 --- a/src/renderer/pages/About.tsx +++ b/src/renderer/pages/About.tsx @@ -13,9 +13,7 @@ export default function About() {
-
+
-
{appLang?.settings?.method_psiphon_location_desc}
+
+ {appLang?.settings?.method_psiphon_location_desc} +