From 81d47f75127d1b72e1ff67593826fb1b459b8682 Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Wed, 21 Feb 2024 17:35:03 +0330 Subject: [PATCH] [xray] add meta, apple, reddit option to warp --- web/html/xui/xray.html | 42 ++++++++++++++++++++++++++ web/translation/translate.en_US.toml | 6 ++++ web/translation/translate.es_ES.toml | 22 +++++++++----- web/translation/translate.fa_IR.toml | 6 ++++ web/translation/translate.id_ID.toml | 6 ++++ web/translation/translate.ru_RU.toml | 22 +++++++++----- web/translation/translate.vi_VN.toml | 22 +++++++++----- web/translation/translate.zh_Hans.toml | 22 +++++++++----- 8 files changed, 116 insertions(+), 32 deletions(-) diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html index 614ee65b..519a71e1 100644 --- a/web/html/xui/xray.html +++ b/web/html/xui/xray.html @@ -278,6 +278,9 @@ + + + WARP {{ i18n "pages.xray.rules.outbound" }} @@ -772,6 +775,9 @@ google: ["geosite:google"], spotify: ["geosite:spotify"], netflix: ["geosite:netflix"], + meta: ["geosite:meta"], + apple: ["geosite:apple"], + reddit: ["geosite:reddit"], cn: [ "geosite:cn", "regexp:.*\\.cn$" @@ -1933,6 +1939,42 @@ } }, }, + MetaWARPSettings: { + get: function () { + return doAllItemsExist(this.settingsData.domains.meta, this.warpDomains); + }, + set: function (newValue) { + if (newValue) { + this.warpDomains = [...this.warpDomains, ...this.settingsData.domains.meta]; + } else { + this.warpDomains = this.warpDomains.filter(data => !this.settingsData.domains.meta.includes(data)); + } + }, + }, + AppleWARPSettings: { + get: function () { + return doAllItemsExist(this.settingsData.domains.apple, this.warpDomains); + }, + set: function (newValue) { + if (newValue) { + this.warpDomains = [...this.warpDomains, ...this.settingsData.domains.apple]; + } else { + this.warpDomains = this.warpDomains.filter(data => !this.settingsData.domains.apple.includes(data)); + } + }, + }, + RedditWARPSettings: { + get: function () { + return doAllItemsExist(this.settingsData.domains.reddit, this.warpDomains); + }, + set: function (newValue) { + if (newValue) { + this.warpDomains = [...this.warpDomains, ...this.settingsData.domains.reddit]; + } else { + this.warpDomains = this.warpDomains.filter(data => !this.settingsData.domains.reddit.includes(data)); + } + }, + }, SpotifyWARPSettings: { get: function () { return doAllItemsExist(this.settingsData.domains.spotify, this.warpDomains); diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml index d23fa508..8b6e75d8 100644 --- a/web/translation/translate.en_US.toml +++ b/web/translation/translate.en_US.toml @@ -388,6 +388,12 @@ "OpenAIWARPDesc" = "Routes traffic to ChatGPT via WARP." "NetflixWARP" = "Netflix" "NetflixWARPDesc" = "Routes traffic to Netflix via WARP." +"MetaWARP" = "Meta" +"MetaWARPDesc" = "Routes traffic to Meta (Instagram, Facebook, WhatsApp, Threads,...) via WARP." +"AppleWARP" = "Apple" +"AppleWARPDesc" = "Routes traffic to Apple via WARP." +"RedditWARP" = "Reddit" +"RedditWARPDesc" = "Routes traffic to Reddit via WARP." "SpotifyWARP" = "Spotify" "SpotifyWARPDesc" = "Routes traffic to Spotify via WARP." "IRWARP" = "Iran domains" diff --git a/web/translation/translate.es_ES.toml b/web/translation/translate.es_ES.toml index d143a61e..f1cca3bd 100644 --- a/web/translation/translate.es_ES.toml +++ b/web/translation/translate.es_ES.toml @@ -382,14 +382,20 @@ "GoogleIPv4Desc" = "Agregar enrutamiento para que Google se conecte con IPv4." "NetflixIPv4" = "Usar IPv4 para Netflix" "NetflixIPv4Desc" = "Agregar enrutamiento para que Netflix se conecte con IPv4." -"GoogleWARP" = "Rutear Google a través de WARP." -"GoogleWARPDesc" = "Agregar enrutamiento para Google a través de WARP." -"OpenAIWARP" = "Rutear OpenAI (ChatGPT) a través de WARP." -"OpenAIWARPDesc" = "Agregar enrutamiento para OpenAI (ChatGPT) a través de WARP." -"NetflixWARP" = "Rutear Netflix a través de WARP." -"NetflixWARPDesc" = "Agregar enrutamiento para Netflix a través de WARP." -"SpotifyWARP" = "Rutear Spotify a través de WARP." -"SpotifyWARPDesc" = "Agregar enrutamiento para Spotify a través de WARP." +"GoogleWARP" = "Google" +"GoogleWARPDesc" = "Enruta el tráfico a Apple a través de WARP." +"OpenAIWARP" = "OpenAI (ChatGPT)" +"OpenAIWARPDesc" = "Enruta el tráfico a OpenAI (ChatGPT) a través de WARP." +"NetflixWARP" = "Netflix" +"NetflixWARPDesc" = "Enruta el tráfico a Netflix a través de WARP." +"MetaWARP" = "Meta" +"MetaWARPDesc" = "Enruta el tráfico a Meta (Instagram, Facebook, WhatsApp, Threads,...) a través de WARP." +"AppleWARP" = "Apple" +"AppleWARPDesc" = "Enruta el tráfico a Apple a través de WARP." +"RedditWARP" = "Reddit" +"RedditWARPDesc" = "Enruta el tráfico a Reddit a través de WARP." +"SpotifyWARP" = "Spotify" +"SpotifyWARPDesc" = "Enruta el tráfico a Spotify a través de WARP." "IRWARP" = "Rutear dominios de Irán a través de WARP." "IRWARPDesc" = "Agregar enrutamiento para dominios de Irán a través de WARP." "Inbounds" = "Entrante" diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml index 92e621a4..0ae94f01 100644 --- a/web/translation/translate.fa_IR.toml +++ b/web/translation/translate.fa_IR.toml @@ -388,6 +388,12 @@ "OpenAIWARPDesc" = "ترافیک را از طریق وارپ به چت جی‌پی‌تی هدایت می‌کند" "NetflixWARP" = "نتفلیکس" "NetflixWARPDesc" = "ترافیک را از طریق وارپ به نتفلیکس هدایت می‌کند" +"MetaWARP" = "متا" +"MetaWARPDesc" = "ترافیک را از طریق وارپ به متا (اینستاگرام، فیس بوک، واتساپ، تردز و...) هدایت می کند." +"AppleWARP" = "اپل" +"AppleWARPDesc" = " ترافیک را از طریق وارپ به اپل هدایت می‌کند" +"RedditWARP" = "ردیت" +"RedditWARPDesc" = " ترافیک را از طریق وارپ به ردیت هدایت می‌کند" "SpotifyWARP" = "اسپاتیفای" "SpotifyWARPDesc" = " ترافیک را از طریق وارپ به اسپاتیفای هدایت می‌کند" "IRWARP" = "دامنه‌های ایران" diff --git a/web/translation/translate.id_ID.toml b/web/translation/translate.id_ID.toml index 3de69a3a..20bbe9ab 100644 --- a/web/translation/translate.id_ID.toml +++ b/web/translation/translate.id_ID.toml @@ -388,6 +388,12 @@ "OpenAIWARPDesc" = "Rute lalu lintas ke ChatGPT melalui WARP." "NetflixWARP" = "Netflix" "NetflixWARPDesc" = "Rute lalu lintas ke Netflix melalui WARP." +"MetaWARP" = "Meta" +"MetaWARPDesc" = "Merutekan lalu lintas ke Meta (Instagram, Facebook, WhatsApp, Threads,...) melalui WARP." +"AppleWARP" = "Apple" +"AppleWARPDesc" = "Merutekan lalu lintas ke Apple melalui WARP." +"RedditWARP" = "Reddit" +"RedditWARPDesc" = "Merutekan lalu lintas ke Reddit melalui WARP." "SpotifyWARP" = "Spotify" "SpotifyWARPDesc" = "Rute lalu lintas ke Spotify melalui WARP." "IRWARP" = "Domain Iran" diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml index 5345c5f2..b8c161f9 100644 --- a/web/translation/translate.ru_RU.toml +++ b/web/translation/translate.ru_RU.toml @@ -382,14 +382,20 @@ "GoogleIPv4Desc" = "Добавить маршрутизацию для Google для подключения к IPv4" "NetflixIPv4" = "Использовать IPv4 для Netflix" "NetflixIPv4Desc" = "Добавить маршрутизацию для Netflix для подключения к IPv4" -"GoogleWARP" = "Маршрутизация Google через WARP" -"GoogleWARPDesc" = "Добавить маршрутизацию для Google через WARP" -"OpenAIWARP" = "Маршрутизация OpenAI (ChatGPT) через WARP" -"OpenAIWARPDesc" = "Добавить маршрутизацию для OpenAI (ChatGPT) через WARP" -"NetflixWARP" = "Маршрутизация Netflix через WARP" -"NetflixWARPDesc" = "Добавить маршрутизацию для Netflix через WARP" -"SpotifyWARP" = "Маршрутизация Spotify через WARP" -"SpotifyWARPDesc" = "Добавить маршрутизацию для Spotify через WARP" +"GoogleWARP" = "Google" +"GoogleWARPDesc" = "Направляет трафик в Google через WARP." +"OpenAIWARP" = "OpenAI (ChatGPT)" +"OpenAIWARPDesc" = "Направляет трафик в OpenAI (ChatGPT) через WARP." +"NetflixWARP" = "Netflix" +"NetflixWARPDesc" = "Направляет трафик в Apple через WARP." +"MetaWARP" = "Мета" +"MetaWARPDesc" = "Направляет трафик в Meta (Instagram, Facebook, WhatsApp, Threads...) через WARP." +"AppleWARP" = "Apple" +"AppleWARPDesc" = "Направляет трафик в Apple через WARP." +"RedditWARP" = "Reddit" +"RedditWARPDesc" = "Направляет трафик в Reddit через WARP." +"SpotifyWARP" = "Spotify" +"SpotifyWARPDesc" = "Направляет трафик в Spotify через WARP." "IRWARP" = "Маршрутизация доменов Ирана через WARP" "IRWARPDesc" = "Добавить маршрутизацию для доменов Ирана через WARP" "Inbounds" = "Входящие" diff --git a/web/translation/translate.vi_VN.toml b/web/translation/translate.vi_VN.toml index ca861567..d748d839 100644 --- a/web/translation/translate.vi_VN.toml +++ b/web/translation/translate.vi_VN.toml @@ -382,14 +382,20 @@ "GoogleIPv4Desc" = "Thêm định tuyến cho Google để kết nối qua IPv4." "NetflixIPv4" = "Sử dụng IPv4 cho Netflix" "NetflixIPv4Desc" = "Thêm định tuyến cho Netflix để kết nối qua IPv4." -"GoogleWARP" = "Định tuyến Google qua WARP." -"GoogleWARPDesc" = "Thêm định tuyến cho Google qua WARP." -"OpenAIWARP" = "Định tuyến OpenAI (ChatGPT) qua WARP." -"OpenAIWARPDesc" = "Thêm định tuyến cho OpenAI (ChatGPT) qua WARP." -"NetflixWARP" = "Định tuyến Netflix qua WARP." -"NetflixWARPDesc" = "Thêm định tuyến cho Netflix qua WARP." -"SpotifyWARP" = "Định tuyến Spotify qua WARP." -"SpotifyWARPDesc" = "Thêm định tuyến cho Spotify qua WARP." +"GoogleWARP" = "Google" +"GoogleWARPDesc" = "Định tuyến lưu lượng truy cập tới Google thông qua WARP." +"OpenAIWARP" = "OpenAI (ChatGPT)" +"OpenAIWARPDesc" = "Định tuyến lưu lượng truy cập tới OpenAI (ChatGPT) thông qua WARP." +"NetflixWARP" = "Netflix" +"NetflixWARPDesc" = "Định tuyến lưu lượng truy cập tới Netflix thông qua WARP." +"MetaWARP" = "Meta" +"MetaWARPDesc" = "Định tuyến lưu lượng truy cập tới Meta (Instagram, Facebook, WhatsApp, Threads,...) thông qua WARP." +"AppleWARP" = "Apple" +"AppleWARPDesc" = "Định tuyến lưu lượng truy cập tới Apple thông qua WARP." +"RedditWARP" = "Reddit" +"RedditWARPDesc" = "Định tuyến lưu lượng truy cập tới Reddit thông qua WARP." +"SpotifyWARP" = "Spotify" +"SpotifyWARPDesc" = "Định tuyến lưu lượng truy cập tới Spotify thông qua WARP." "IRWARP" = "Định tuyến tên miền của Iran qua WARP." "IRWARPDesc" = "Thêm định tuyến cho các tên miền của Iran qua WARP." "Inbounds" = "Đầu vào" diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml index 95319364..7eda1fed 100644 --- a/web/translation/translate.zh_Hans.toml +++ b/web/translation/translate.zh_Hans.toml @@ -382,14 +382,20 @@ "GoogleIPv4Desc" = "添加谷歌连接IPv4的路由" "NetflixIPv4" = "为 Netflix 使用 IPv4" "NetflixIPv4Desc" = "添加Netflix连接IPv4的路由" -"GoogleWARP" = "将谷歌路由到 WARP" -"GoogleWARPDesc" = "为谷歌添加路由到WARP" -"OpenAIWARP" = "将 OpenAI (ChatGPT) 路由到 WARP" -"OpenAIWARPDesc" = "将OpenAI（ChatGPT）路由添加到WARP" -"NetflixWARP" = "将 Netflix 路由到 WARP" -"NetflixWARPDesc" = "为Netflix添加路由到WARP" -"SpotifyWARP" = "将 Spotify 路由到 WARP" -"SpotifyWARPDesc" = "为Spotify添加路由到WARP" +"GoogleWARP" = "Google" +"GoogleWARPDesc" = "通过 WARP 将流量路由到 Google。" +"OpenAIWARP" = "OpenAI (ChatGPT)" +"OpenAIWARPDesc" = "通过 WARP 将流量路由到 OpenAI (ChatGPT)。" +"NetflixWARP" = "Netflix" +"NetflixWARPDesc" = "通过 WARP 将流量路由到 Netflix。" +"MetaWARP"="Meta" +"MetaWARPDesc" = "通过 WARP 将流量路由到 Meta（Instagram、Facebook、WhatsApp、Threads...）" +"AppleWARP" = "Apple" +"AppleWARPDesc" = "通过 WARP 将流量路由到 Apple。" +"RedditWARP" = "Reddit" +"RedditWARPDesc" = "通过 WARP 将流量路由到 Reddit。" +"SpotifyWARP" = "Spotify" +"SpotifyWARPDesc" = "通过 WARP 将流量路由到 Spotify。" "IRWARP" = "将伊朗域名路由到 WARP" "IRWARPDesc" = "将伊朗域的路由添加到 WARP。 重启面板生效" "Inbounds" = "入站"