Add subscription proxy server to My Servers

src/_locales/ar/messages.json

@@ -462,6 +462,9 @@
 	"settingsAddServerButton": {
 		"message": "إضافة خادم"
 	},
+	"settingsAddActiveSubscriptionProxyServerButton": {
+		"message": "أضف إلى خوادمي"
+	},
 	"settingsRemoveMultipleServerButton": {
 		"message": "حذف متعدد"
 	},

src/_locales/de/messages.json

@@ -420,15 +420,15 @@
 	"settingsGeneralDisplayAppliedRulePatternOnBadge": {
 		"message": "Angewandtes Regelmuster am Icon anzeigen"
 	},
-	"settingsGeneralRefreshTabOnConfigChanges": {
-		"message": "Aktiven Tab neu laden, wenn sich das Profil oder der Proxy ändert"
-	},
-	"settingsGeneralDeleteRuleWhenDisabledFromPopup": {
-		"message": "Regel löschen, wenn sie im Popup-Menü deaktiviert/abgewählt wird"
-	},
-	"settingsGeneralCancelButton": {
-		"message": "Abbrechen"
-	},
+	"settingsGeneralRefreshTabOnConfigChanges": {
+		"message": "Aktiven Tab neu laden, wenn sich das Profil oder der Proxy ändert"
+	},
+	"settingsGeneralDeleteRuleWhenDisabledFromPopup": {
+		"message": "Regel löschen, wenn sie im Popup-Menü deaktiviert/abgewählt wird"
+	},
+	"settingsGeneralCancelButton": {
+		"message": "Abbrechen"
+	},
 	"settingsGeneralSaveChanges": {
 		"message": "Änderungen speichern"
 	},
@@ -462,6 +462,9 @@
 	"settingsAddServerButton": {
 		"message": "Server hinzufügen"
 	},
+	"settingsAddActiveSubscriptionProxyServerButton": {
+		"message": "Zu meinen Servern hinzufügen"
+	},
 	"settingsRemoveMultipleServerButton": {
 		"message": "Mehrere löschen"
 	},

src/_locales/en/messages.json

@@ -420,15 +420,15 @@
 	"settingsGeneralDisplayAppliedRulePatternOnBadge": {
 		"message": "Display applied rule pattern on badge"
 	},
-	"settingsGeneralRefreshTabOnConfigChanges": {
-		"message": "Refresh active tab when profile or proxy changed"
-	},
-	"settingsGeneralDeleteRuleWhenDisabledFromPopup": {
-		"message": "Delete rule when disabled/unchecked from popup menu"
-	},
-	"settingsGeneralCancelButton": {
-		"message": "Cancel"
-	},
+	"settingsGeneralRefreshTabOnConfigChanges": {
+		"message": "Refresh active tab when profile or proxy changed"
+	},
+	"settingsGeneralDeleteRuleWhenDisabledFromPopup": {
+		"message": "Delete rule when disabled/unchecked from popup menu"
+	},
+	"settingsGeneralCancelButton": {
+		"message": "Cancel"
+	},
 	"settingsGeneralSaveChanges": {
 		"message": "Save Changes"
 	},
@@ -462,6 +462,9 @@
 	"settingsAddServerButton": {
 		"message": "Add Server"
 	},
+	"settingsAddActiveSubscriptionProxyServerButton": {
+		"message": "Add to My Servers"
+	},
 	"settingsRemoveMultipleServerButton": {
 		"message": "Delete Multiple"
 	},

src/_locales/es/messages.json

@@ -462,6 +462,9 @@
 	"settingsAddServerButton": {
 		"message": "Agregar servidor"
 	},
+	"settingsAddActiveSubscriptionProxyServerButton": {
+		"message": "Agregar a Mis Servidores"
+	},
 	"settingsRemoveMultipleServerButton": {
 		"message": "Eliminar varios"
 	},

src/_locales/fa/messages.json

@@ -462,6 +462,9 @@
 	"settingsAddServerButton": {
 		"message": "افزودن پراکسی سرور"
 	},
+	"settingsAddActiveSubscriptionProxyServerButton": {
+		"message": "افزودن به سرورهای من"
+	},
 	"settingsRemoveMultipleServerButton": {
 		"message": "حذف چندتایی"
 	},

src/_locales/fr/messages.json

@@ -462,6 +462,9 @@
 	"settingsAddServerButton": {
 		"message": "Ajouter serveur"
 	},
+	"settingsAddActiveSubscriptionProxyServerButton": {
+		"message": "Ajouter à mes serveurs"
+	},
 	"settingsRemoveMultipleServerButton": {
 		"message": "Supprimer plusieurs"
 	},

src/_locales/id/messages.json

@@ -462,6 +462,9 @@
 	"settingsAddServerButton": {
 		"message": "Tambahkan Server"
 	},
+	"settingsAddActiveSubscriptionProxyServerButton": {
+		"message": "Tambahkan ke Server Saya"
+	},
 	"settingsRemoveMultipleServerButton": {
 		"message": "Hapus Banyak"
 	},

src/_locales/it/messages.json

@@ -462,6 +462,9 @@
 	"settingsAddServerButton": {
 		"message": "Aggiungi Server"
 	},
+	"settingsAddActiveSubscriptionProxyServerButton": {
+		"message": "Aggiungi ai miei server"
+	},
 	"settingsRemoveMultipleServerButton": {
 		"message": "Elimina Multipli"
 	},

src/_locales/nl/messages.json

@@ -462,6 +462,9 @@
 	"settingsAddServerButton": {
 		"message": "Server toevoegen"
 	},
+	"settingsAddActiveSubscriptionProxyServerButton": {
+		"message": "Toevoegen aan Mijn servers"
+	},
 	"settingsRemoveMultipleServerButton": {
 		"message": "Verwijder meerdere"
 	},

src/_locales/pl/messages.json

@@ -462,6 +462,9 @@
 	"settingsAddServerButton": {
 		"message": "Dodaj serwer"
 	},
+	"settingsAddActiveSubscriptionProxyServerButton": {
+		"message": "Dodaj do moich serwerów"
+	},
 	"settingsRemoveMultipleServerButton": {
 		"message": "Usuń wiele"
 	},

src/_locales/ru/messages.json

@@ -462,6 +462,9 @@
 	"settingsAddServerButton": {
 		"message": "Добавить сервер"
 	},
+	"settingsAddActiveSubscriptionProxyServerButton": {
+		"message": "Добавить в мои серверы"
+	},
 	"settingsRemoveMultipleServerButton": {
 		"message": "Удалить несколько"
 	},

src/_locales/tr/messages.json

@@ -462,6 +462,9 @@
 	"settingsAddServerButton": {
 		"message": "Sunucu ekle"
 	},
+	"settingsAddActiveSubscriptionProxyServerButton": {
+		"message": "Sunucularıma ekle"
+	},
 	"settingsRemoveMultipleServerButton": {
 		"message": "Çoklu Sil"
 	},

src/_locales/zh-TW/messages.json

@@ -462,6 +462,9 @@
 	"settingsAddServerButton": {
 		"message": "添加服務器"
 	},
+	"settingsAddActiveSubscriptionProxyServerButton": {
+		"message": "新增至我的伺服器"
+	},
 	"settingsRemoveMultipleServerButton": {
 		"message": "刪除多個"
 	},

src/_locales/zh_CN/messages.json

@@ -462,6 +462,9 @@
 	"settingsAddServerButton": {
 		"message": "添加服务器"
 	},
+	"settingsAddActiveSubscriptionProxyServerButton": {
+		"message": "添加到我的服务器"
+	},
 	"settingsRemoveMultipleServerButton": {
 		"message": "删除多个"
 	},

src/ui/code/settingsPage.ts

@@ -207,6 +207,8 @@ export class settingsPage {
 
 		jq("#btnAddProxyServer").click(settingsPage.uiEvents.onClickAddProxyServer);
 
+		jq("#btnAddActiveSubscriptionProxyServerToMyServers").click(settingsPage.uiEvents.onClickAddActiveSubscriptionProxyServerToMyServers);
+
 		jq("#btnRemoveMultipleProxyServer").click(settingsPage.uiEvents.onClickRemoveMultipleProxyServer);
 
 		jq("#cmdServerProtocol").on("change", settingsPage.uiEvents.onChangeServerProtocol);
@@ -1201,6 +1203,7 @@ export class settingsPage {
 
 		// populate
 		this.populateProxyServersToComboBox(cmbActiveProxyServer, defaultProxyServerId, proxyServers, serverSubscriptions);
+		this.updateActiveSubscriptionProxyServerAction();
 	}
 
 	private static readServers(): ProxyServer[] {
@@ -1318,6 +1321,35 @@ export class settingsPage {
 		return null;
 	}
 
+	private static findProxyServerSubscriptionByProxyServerId(proxyServerId: string): ProxyServerSubscription | null {
+		if (!proxyServerId)
+			return null;
+
+		let serverSubscriptions = settingsPage.readServerSubscriptions();
+		for (let subscription of serverSubscriptions) {
+			if (!subscription.enabled || !subscription.proxies)
+				continue;
+
+			let proxy = subscription.proxies.find(item => item.id === proxyServerId);
+			if (proxy !== undefined)
+				return subscription;
+		}
+		return null;
+	}
+
+	private static updateActiveSubscriptionProxyServerAction() {
+		let proxyServerId = jq("#cmbActiveProxyServer").val() as string;
+		let subscription = settingsPage.findProxyServerSubscriptionByProxyServerId(proxyServerId);
+		let button = jq("#btnAddActiveSubscriptionProxyServerToMyServers");
+
+		if (subscription) {
+			button.removeClass("d-none");
+		}
+		else {
+			button.addClass("d-none");
+		}
+	}
+
 	private static exportServersListFormatted(): string {
 		let proxyList = settingsPage.readServers();
 		let result = `[SmartProxy Servers]\r\n`;
@@ -2640,6 +2672,7 @@ export class settingsPage {
 			else {
 				Debug.warn("Settings> Selected ActiveProxyServer ID not found!");
 			}
+			settingsPage.updateActiveSubscriptionProxyServerAction();
 		},
 		onClickAddProxyServer() {
 
@@ -2651,6 +2684,29 @@ export class settingsPage {
 			modal.modal("show");
 			modal.find("#txtServerAddress").focus();
 		},
+		onClickAddActiveSubscriptionProxyServerToMyServers() {
+			let proxyServerId = jq("#cmbActiveProxyServer").val() as string;
+			let subscription = settingsPage.findProxyServerSubscriptionByProxyServerId(proxyServerId);
+			if (!subscription || !subscription.proxies)
+				return;
+
+			let server = subscription.proxies.find(item => item.id === proxyServerId);
+			if (!server)
+				return;
+
+			let modal = jq("#modalModifyProxyServer");
+			modal.data("editing", null);
+
+			let serverToAdd = new ProxyServer();
+			jQuery.extend(serverToAdd, server);
+			serverToAdd.order = settingsPage.readServers().reduce((order, item) => Math.max(order, item.order || 0), 0) + 1;
+			serverToAdd.name = settingsPage.generateNewServerName(subscription.name);
+
+			settingsPage.populateServerModal(modal, serverToAdd);
+
+			modal.modal("show");
+			modal.find("#txtServerAddress").focus();
+		},
 		onClickRemoveMultipleProxyServer() {
 			var rows = settingsPage.grdServers.rows({ selected: true });
 			if (!rows)
@@ -4367,25 +4423,25 @@ export class settingsPage {
 	//#endregion
 
 	//#region Common functions ---------------
-	private static generateNewServerName(): string {
+	private static generateNewServerName(prefix: string = "Server"): string {
 		// generates a unique name for proxy server
 		let servers = this.readServers();
 		let serverNo = 1;
-		let result = `Server ${serverNo}`;
+		let result = `${prefix} ${serverNo}`;
 
 		if (servers && servers.length > 0) {
 			let exist;
 
 			serverNo = servers.length + 1;
-			result = `Server ${serverNo}`;
+			result = `${prefix} ${serverNo}`;
 
 			do {
 				exist = false;
 				for (let i = servers.length - 1; i >= 0; i--) {
 					if (servers[i].name === result) {
 						exist = true;
 						serverNo++;
-						result = `Server ${serverNo}`;
+						result = `${prefix} ${serverNo}`;
 						break;
 					}
 				}

src/ui/settings.html

@@ -599,6 +599,10 @@ <h5 data-localize="settingsActiveProxyServer">
 									<option value="0">(Select)</option>
 								</select>
 							</div>
+							<div class="col-auto">
+								<button id="btnAddActiveSubscriptionProxyServerToMyServers" class="btn btn-info d-none"
+									data-localize="settingsAddActiveSubscriptionProxyServerButton">Add to My Servers</button>
+							</div>
 						</div>
 						<h5 data-localize="settingsTabProxyServersTitle">
 							Manage your proxy servers: