From 6dab034a265231aa3c228b80c1d8bd9ef011944e Mon Sep 17 00:00:00 2001 From: GeekQu Date: Fri, 11 Oct 2019 06:59:22 +0800 Subject: [PATCH] emoji --- app/Controllers/LinkController.php | 74 ++++++------ app/Utils/Tools.php | 175 +++++++++++++++++++++++++++++ app/Utils/URL.php | 56 ++++----- config/.config.example.php | 1 + 4 files changed, 246 insertions(+), 60 deletions(-) diff --git a/app/Controllers/LinkController.php b/app/Controllers/LinkController.php index b2e54d50..670c0812 100644 --- a/app/Controllers/LinkController.php +++ b/app/Controllers/LinkController.php @@ -89,6 +89,10 @@ class LinkController extends BaseController $find = true; } + $emoji = ((isset($opts['emoji']) && $opts['emoji'] == 'true') || Config::get('add_emoji_to_node_name') == 'true' + ? 1 + : 0); + // 兼容原版 if (isset($opts['mu'])) { $mu = (int) $opts['mu']; @@ -141,7 +145,7 @@ class LinkController extends BaseController $getBody = self::getBody( $user, $response, - self::$class($user, $int, $opts, $Rule, $find), + self::$class($user, $int, $opts, $Rule, $find, $emoji), $value['filename'] ); $subscribe_type = $value['class']; @@ -162,7 +166,7 @@ class LinkController extends BaseController $getBody = self::getBody( $user, $response, - self::getSub($user, $int, $opts, $Rule, $find), + self::getSub($user, $int, $opts, $Rule, $find, $emoji), $value['filename'] ); } @@ -287,7 +291,7 @@ class LinkController extends BaseController * * @return string */ - public static function getSurge($user, $surge, $opts, $Rule, $find) + public static function getSurge($user, $surge, $opts, $Rule, $find, $emoji) { $subInfo = self::getSubinfo($user, $surge); $userapiUrl = $subInfo['surge']; @@ -296,8 +300,8 @@ class LinkController extends BaseController : false); $All_Proxy = ''; $items = array_merge( - URL::getAllItems($user, 0, 1), - URL::getAllItems($user, 1, 1) + URL::getAllItems($user, 0, 1, $emoji), + URL::getAllItems($user, 1, 1, $emoji) ); if (!$source && $surge == 1) { foreach ($items as $item) { @@ -312,7 +316,7 @@ class LinkController extends BaseController } // v2 - $v2_items = URL::getAllVMessUrl($user, 1); + $v2_items = URL::getAllVMessUrl($user, 1, $emoji); foreach ($v2_items as $item) { if (!in_array($item['net'], ['ws', 'tcp'])) { continue; @@ -347,7 +351,7 @@ class LinkController extends BaseController if ($surge == 4) { // v2 - $v2_items = URL::getAllVMessUrl($user, 1); + $v2_items = URL::getAllVMessUrl($user, 1, $emoji); foreach ($v2_items as $item) { if (!in_array($item['net'], ['ws', 'tcp'])) { continue; @@ -412,7 +416,7 @@ class LinkController extends BaseController * * @return string */ - public static function getQuantumult($user, $quantumult, $opts, $Rule, $find) + public static function getQuantumult($user, $quantumult, $opts, $Rule, $find, $emoji) { $subInfo = self::getSubinfo($user, 0); $proxys = []; @@ -424,7 +428,7 @@ class LinkController extends BaseController $back_china_name = ''; $v2ray_group = ''; $v2ray_name = ''; - $v2rays = URL::getAllVMessUrl($user, 1); + $v2rays = URL::getAllVMessUrl($user, 1, $emoji); foreach ($v2rays as $v2ray) { if ($v2ray['net'] == 'kcp' || $v2ray['net'] == 'quic') { continue; @@ -453,7 +457,7 @@ class LinkController extends BaseController } elseif ($quantumult == 3) { $ss_group = ''; $ss_name = ''; - $items = array_merge(URL::getAllItems($user, 0, 1), URL::getAllItems($user, 1, 1)); + $items = array_merge(URL::getAllItems($user, 0, 1, $emoji), URL::getAllItems($user, 1, 1, $emoji)); foreach ($items as $item) { $ss_group .= $item['remark'] . ' = shadowsocks, ' . $item['address'] . ', ' . $item['port'] . ', ' . $item['method'] . ', "' . $item['passwd'] . '", upstream-proxy=false, upstream-proxy-auth=false' . URL::getSurgeObfs($item) . ', group=' . Config::get('appName') . PHP_EOL; if (strpos($item['remark'], '回国') or strpos($item['remark'], 'China')) { @@ -464,7 +468,7 @@ class LinkController extends BaseController } $ssr_group = ''; $ssr_name = ''; - $ssrs = array_merge(URL::getAllItems($user, 0, 0), URL::getAllItems($user, 1, 0)); + $ssrs = array_merge(URL::getAllItems($user, 0, 0, $emoji), URL::getAllItems($user, 1, 0, $emoji)); foreach ($ssrs as $item) { $ssr_group .= $item['remark'] . ' = shadowsocksr, ' . $item['address'] . ', ' . $item['port'] . ', ' . $item['method'] . ', "' . $item['passwd'] . '", protocol=' . $item['protocol'] . ', protocol_param=' . $item['protocol_param'] . ', obfs=' . $item['obfs'] . ', obfs_param="' . $item['obfs_param'] . '", group=' . Config::get('appName') . PHP_EOL; if (strpos($item['remark'], '回国') or strpos($item['remark'], 'China')) { @@ -514,12 +518,12 @@ class LinkController extends BaseController * * @return string */ - public static function getSurfboard($user, $surfboard, $opts, $Rule, $find) + public static function getSurfboard($user, $surfboard, $opts, $Rule, $find, $emoji) { $subInfo = self::getSubinfo($user, 0); $userapiUrl = $subInfo['surfboard']; $All_Proxy = ''; - $items = array_merge(URL::getAllItems($user, 0, 1), URL::getAllItems($user, 1, 1)); + $items = array_merge(URL::getAllItems($user, 0, 1, $emoji), URL::getAllItems($user, 1, 1, $emoji)); foreach ($items as $item) { $All_Proxy .= ($item['remark'] . ' = custom, ' . $item['address'] . ', ' . $item['port'] . ', ' . $item['method'] . ', ' . $item['passwd'] . ', https://raw.githubusercontent.com/lhie1/Rules/master/SSEncrypt.module' . URL::getSurgeObfs($item) . PHP_EOL); } @@ -552,16 +556,16 @@ class LinkController extends BaseController * * @return string */ - public static function getClash($user, $clash, $opts, $Rule, $find) + public static function getClash($user, $clash, $opts, $Rule, $find, $emoji) { $subInfo = self::getSubinfo($user, 0); $userapiUrl = $subInfo['clash']; $Proxys = []; // ss $items = array_merge( - URL::getAllItems($user, 0, 1), - URL::getAllItems($user, 1, 1), - URL::getAllV2RayPluginItems($user) + URL::getAllItems($user, 0, 1, $emoji), + URL::getAllItems($user, 1, 1, $emoji), + URL::getAllV2RayPluginItems($user, $emoji) ); foreach ($items as $item) { $sss = [ @@ -608,7 +612,7 @@ class LinkController extends BaseController $Proxys[] = $sss; } // v2 - $items = URL::getAllVMessUrl($user, 1); + $items = URL::getAllVMessUrl($user, 1, $emoji); foreach ($items as $item) { if (in_array($item['net'], array('kcp', 'http', 'quic'))) { continue; @@ -643,8 +647,8 @@ class LinkController extends BaseController if ($clash == 2) { // ssr $items = array_merge( - URL::getAllItems($user, 0, 0), - URL::getAllItems($user, 1, 0) + URL::getAllItems($user, 0, 0, $emoji), + URL::getAllItems($user, 1, 0, $emoji) ); foreach ($items as $item) { // 不支持的 @@ -718,7 +722,7 @@ class LinkController extends BaseController * * @return string */ - public static function getSSD($user, $ssd, $opts, $Rule, $find) + public static function getSSD($user, $ssd, $opts, $Rule, $find, $emoji) { return URL::getAllSSDUrl($user); } @@ -733,8 +737,10 @@ class LinkController extends BaseController * * @return string */ - public static function getShadowrocket($user, $shadowrocket, $opts, $Rule, $find) + public static function getShadowrocket($user, $shadowrocket, $opts, $Rule, $find, $emoji) { + $emoji = 0; // Shadowrocket 自带 emoji + $return = ''; if (strtotime($user->expire_in) > time()) { if ($user->transfer_enable == 0) { @@ -865,7 +871,7 @@ class LinkController extends BaseController * * @return string */ - public static function getKitsunebi($user, $kitsunebi, $opts, $Rule, $find) + public static function getKitsunebi($user, $kitsunebi, $opts, $Rule, $find, $emoji) { $return = ''; @@ -874,7 +880,7 @@ class LinkController extends BaseController $return .= $extend == 0 ? '' : URL::getUserTraffic($user, 2) . PHP_EOL; // v2ray - $items = URL::getAllVMessUrl($user, 1); + $items = URL::getAllVMessUrl($user, 1, $emoji); foreach ($items as $item) { if ($find) { $item['remark'] = $item['ps']; @@ -915,7 +921,7 @@ class LinkController extends BaseController if (URL::SSCanConnect($user) && !in_array($user->obfs, ['simple_obfs_http', 'simple_obfs_tls'])) { $user = URL::getSSConnectInfo($user); $user->obfs = 'plain'; - $items = URL::getAllItems($user, 0, 1); + $items = URL::getAllItems($user, 0, 1, $emoji); if ($find) { foreach ($items as $item) { $item = ConfController::getMatchProxy($item, $Rule); @@ -944,7 +950,7 @@ class LinkController extends BaseController * * @return string */ - public static function getSub($user, $sub, $opts, $Rule, $find) + public static function getSub($user, $sub, $opts, $Rule, $find, $emoji) { $extend = isset($opts['extend']) ? $opts['extend'] : 0; $getV2rayPlugin = 1; @@ -962,26 +968,26 @@ class LinkController extends BaseController switch ($sub) { case 1: // SSR $return_url .= $extend == 0 ? '' : URL::getUserTraffic($user, 1) . PHP_EOL; - $return_url .= URL::get_NewAllUrl($user, 0, $getV2rayPlugin, $Rule, $find) . PHP_EOL; + $return_url .= URL::get_NewAllUrl($user, 0, $getV2rayPlugin, $Rule, $find, $emoji) . PHP_EOL; break; case 2: // SS $return_url .= $extend == 0 ? '' : URL::getUserTraffic($user, 2) . PHP_EOL; - $return_url .= URL::get_NewAllUrl($user, 1, $getV2rayPlugin, $Rule, $find) . PHP_EOL; + $return_url .= URL::get_NewAllUrl($user, 1, $getV2rayPlugin, $Rule, $find, $emoji) . PHP_EOL; break; case 3: // V2 $return_url .= $extend == 0 ? '' : URL::getUserTraffic($user, 3) . PHP_EOL; - $return_url .= URL::getAllVMessUrl($user) . PHP_EOL; + $return_url .= URL::getAllVMessUrl($user, 0, $emoji) . PHP_EOL; break; case 4: // V2 + SS $return_url .= $extend == 0 ? '' : URL::getUserTraffic($user, 3) . PHP_EOL; - $return_url .= URL::getAllVMessUrl($user) . PHP_EOL; - $return_url .= URL::get_NewAllUrl($user, 1, $getV2rayPlugin, $Rule, $find) . PHP_EOL; + $return_url .= URL::getAllVMessUrl($user, 0, $emoji) . PHP_EOL; + $return_url .= URL::get_NewAllUrl($user, 1, $getV2rayPlugin, $Rule, $find, $emoji) . PHP_EOL; break; case 5: // V2 + SS + SSR $return_url .= $extend == 0 ? '' : URL::getUserTraffic($user, 1) . PHP_EOL; - $return_url .= URL::getAllVMessUrl($user) . PHP_EOL; - $return_url .= URL::get_NewAllUrl($user, 1, $getV2rayPlugin, $Rule, $find) . PHP_EOL; - $return_url .= URL::get_NewAllUrl($user, 0, $getV2rayPlugin, $Rule, $find) . PHP_EOL; + $return_url .= URL::getAllVMessUrl($user, 0, $emoji) . PHP_EOL; + $return_url .= URL::get_NewAllUrl($user, 1, $getV2rayPlugin, $Rule, $find, $emoji) . PHP_EOL; + $return_url .= URL::get_NewAllUrl($user, 0, $getV2rayPlugin, $Rule, $find, $emoji) . PHP_EOL; break; } return Tools::base64_url_encode($return_url); diff --git a/app/Utils/Tools.php b/app/Utils/Tools.php index 3da942bc..6dfd214c 100644 --- a/app/Utils/Tools.php +++ b/app/Utils/Tools.php @@ -595,4 +595,179 @@ class Tools 'port' => $port ]; } + + // 请将冷门的国家或地区放置在上方,热门的中继起源放置在下方 + // 以便于兼容如:【上海 -> 美国】等节点名称 + private static $emoji = [ + "🇦🇷" => [ + "阿根廷" + ], + "🇦🇹" => [ + "奥地利", + "维也纳" + ], + "🇦🇺" => [ + "澳大利亚", + "悉尼" + ], + "🇧🇷" => [ + "巴西", + "圣保罗" + ], + "🇨🇦" => [ + "加拿大", + "蒙特利尔", + "温哥华" + ], + "🇨🇭" => [ + "瑞士", + "苏黎世" + ], + "🇩🇪" => [ + "德国", + "法兰克福" + ], + "🇫🇮" => [ + "芬兰", + "赫尔辛基" + ], + "🇫🇷" => [ + "法国", + "巴黎" + ], + "🇬🇧" => [ + "英国", + "伦敦" + ], + "🇮🇩" => [ + "印尼", + "印度尼西亚", + "雅加达" + ], + "🇮🇪" => [ + "爱尔兰", + "都柏林" + ], + "🇮🇳" => [ + "印度", + "孟买" + ], + "🇮🇹" => [ + "意大利", + "米兰" + ], + "🇰🇵" => [ + "朝鲜" + ], + "🇲🇾" => [ + "马来西亚" + ], + "🇳🇱" => [ + "荷兰", + "阿姆斯特丹" + ], + "🇵🇭" => [ + "菲律宾" + ], + "🇷🇴" => [ + "罗马尼亚" + ], + "🇷🇺" => [ + "俄罗斯", + "伯力", + "莫斯科", + "圣彼得堡", + "西伯利亚", + "新西伯利亚" + ], + "🇸🇬" => [ + "新加坡" + ], + "🇹🇭" => [ + "泰国", + "曼谷" + ], + "🇹🇷" => [ + "土耳其", + "伊斯坦布尔" + ], + "🇺🇲" => [ + "美国", + "波特兰", + "俄勒冈", + "凤凰城", + "费利蒙", + "硅谷", + "拉斯维加斯", + "洛杉矶", + "圣克拉拉", + "西雅图", + "芝加哥", + "沪美" + ], + "🇻🇳" => [ + "越南" + ], + "🇿🇦" => [ + "南非" + ], + "🇰🇷" => [ + "韩国", + "首尔" + ], + "🇲🇴" => [ + "澳门" + ], + "🇯🇵" => [ + "日本", + "东京", + "大阪", + "埼玉", + "沪日" + ], + "🇹🇼" => [ + "台湾", + "台北", + "台中" + ], + "🇭🇰" => [ + "香港", + "深港" + ], + "🇨🇳" => [ + "中国", + "江苏", + "北京", + "上海", + "深圳", + "杭州", + "徐州", + "宁波", + "镇江" + ] + ]; + + public static function addEmoji($Name) + { + $done = [ + 'index' => -1, + 'emoji' => '' + ]; + foreach (self::$emoji as $key => $value) { + foreach ($value as $item) { + $index = strpos($Name, $item); + if ($index !== false) { + $done['index'] = $index; + $done['emoji'] = $key; + continue 2; + } + } + } + return ($done['index'] == -1 + ? $Name + : ($done['emoji'] . ' ' . $Name)); + } + + + } diff --git a/app/Utils/URL.php b/app/Utils/URL.php index 598add68..2d6fc1c6 100644 --- a/app/Utils/URL.php +++ b/app/Utils/URL.php @@ -139,11 +139,8 @@ class URL return $new_user; } - public static function getAllItems( - $user, - $is_mu = 0, - $is_ss = 0 - ) { + public static function getAllItems($user, $is_mu = 0, $is_ss = 0, $emoji = 0) + { $return_array = array(); if ($user->is_admin) { $nodes = Node::where( @@ -206,12 +203,12 @@ class URL if (($relay_rule != null) && $relay_rule->dist_node() != null) { $relay_rule_id = $relay_rule->id; } - $item = self::getItem($user, $node, 0, $relay_rule_id, $is_ss); + $item = self::getItem($user, $node, 0, $relay_rule_id, $is_ss, $emoji); if ($item != null) { $return_array[] = $item; } } else { - $item = self::getItem($user, $node, 0, 0, $is_ss); + $item = self::getItem($user, $node, 0, 0, $is_ss, $emoji); if ($item != null) { $return_array[] = $item; } @@ -225,12 +222,12 @@ class URL if (($relay_rule != null) && $relay_rule->dist_node() != null) { $relay_rule_id = $relay_rule->id; } - $item = self::getItem($user, $node, $mu_node->server, $relay_rule_id, $is_ss); + $item = self::getItem($user, $node, $mu_node->server, $relay_rule_id, $is_ss, $emoji); if ($item != null) { $return_array[] = $item; } } else { - $item = self::getItem($user, $node, $mu_node->server, 0, $is_ss); + $item = self::getItem($user, $node, $mu_node->server, 0, $is_ss, $emoji); if ($item != null) { $return_array[] = $item; } @@ -272,7 +269,7 @@ class URL * * @return string */ - public static function get_NewAllUrl($user, $is_ss, $getV2rayPlugin, $Rule, $find) + public static function get_NewAllUrl($user, $is_ss, $getV2rayPlugin, $Rule, $find, $emoji = 0) { $return_url = ''; if (strtotime($user->expire_in) < time()) { @@ -280,14 +277,14 @@ class URL } if ($getV2rayPlugin === 0) { $items = array_merge( - self::getAllItems($user, 0, $is_ss), - self::getAllItems($user, 1, $is_ss) + self::getAllItems($user, 0, $is_ss, $emoji), + self::getAllItems($user, 1, $is_ss, $emoji) ); } else { $items = array_merge( - self::getAllItems($user, 0, $is_ss), - self::getAllItems($user, 1, $is_ss), - self::getAllV2RayPluginItems($user) + self::getAllItems($user, 0, $is_ss, $emoji), + self::getAllItems($user, 1, $is_ss, $emoji), + self::getAllV2RayPluginItems($user, $emoji) ); } if ($find) { @@ -361,7 +358,8 @@ class URL * * @return array */ - public static function getAllV2RayPluginItems($user) { + public static function getAllV2RayPluginItems($user, $emoji = 0) + { $return_array = array(); if ($user->is_admin) { $nodes = Node::where('sort', 13) @@ -382,7 +380,7 @@ class URL ->get(); } foreach ($nodes as $node) { - $item = self::getV2RayPluginItem($user, $node); + $item = self::getV2RayPluginItem($user, $node, $emoji); if ($item != null) { $return_array[] = $item; } @@ -399,14 +397,16 @@ class URL * * @return array */ - public static function getV2RayPluginItem($user, $node) + public static function getV2RayPluginItem($user, $node, $emoji = 0) { // 非 AEAD 加密无法使用 if (!in_array($user->method, Config::getSupportParam('ss_aead_method'))) { return null; } $return_array = Tools::ssv2Array($node->server); - $return_array['remark'] = $node->name; + $return_array['remark'] = ($emoji == 1 + ? Tools::addEmoji($node->name) + : $node->name); $return_array['address'] = $return_array['add']; $return_array['method'] = $user->method; $return_array['passwd'] = $user->passwd; @@ -427,11 +427,13 @@ class URL return $return_array; } - public static function getV2Url($user, $node, $arrout = 0) + public static function getV2Url($user, $node, $arrout = 0, $emoji = 0) { $item = Tools::v2Array($node->server); $item['v'] = '2'; - $item['ps'] = $node->name; + $item['ps'] = ($emoji == 1 + ? Tools::addEmoji($node->name) + : $node->name); $item['id'] = $user->getUuid(); $item['class'] = $node->node_class; if ($arrout == 0) { @@ -443,7 +445,7 @@ class URL return $item; } - public static function getAllVMessUrl($user, $arrout = 0) + public static function getAllVMessUrl($user, $arrout = 0, $emoji = 0) { if ($user->is_admin) { $nodes = Node::where( @@ -475,12 +477,12 @@ class URL if ($arrout == 0) { $result = ''; foreach ($nodes as $node) { - $result .= (self::getV2Url($user, $node, $arrout) . "\n"); + $result .= (self::getV2Url($user, $node, $arrout, $emoji) . "\n"); } } else { $result = []; foreach ($nodes as $node) { - $result[] = self::getV2Url($user, $node, $arrout); + $result[] = self::getV2Url($user, $node, $arrout, $emoji); } } return $result; @@ -686,7 +688,7 @@ class URL * obfs * obfs_param */ - public static function getItem($user, $node, $mu_port = 0, $relay_rule_id = 0, $is_ss = 0) + public static function getItem($user, $node, $mu_port = 0, $relay_rule_id = 0, $is_ss = 0, $emoji = 0) { $relay_rule = Relay::where('id', $relay_rule_id)->where( static function ($query) use ($user) { @@ -735,7 +737,9 @@ class URL } $return_array['passwd'] = $user->passwd; $return_array['method'] = $user->method; - $return_array['remark'] = $node_name; + $return_array['remark'] = ($emoji == 1 + ? Tools::addEmoji($node_name) + : $node_name); $return_array['class'] = $node->node_class; $return_array['group'] = Config::get('appName'); return $return_array; diff --git a/config/.config.example.php b/config/.config.example.php index ea2d5002..88c69d6f 100644 --- a/config/.config.example.php +++ b/config/.config.example.php @@ -297,6 +297,7 @@ $System_Config['db_prefix'] = ''; $System_Config['muKeyList'] = [' ']; //多 key 列表 $System_Config['mu_port_migration'] = 'false'; //为后端直接下发偏移后的端口 $System_Config['relay_port_migration'] = 'false'; //为中转规则下发偏移后的端口,此项未经测试 +$System_Config['add_emoji_to_node_name'] = 'false'; //为部分订阅中默认添加 emoji // 审计自动封禁开关 $System_Config['enable_auto_detect_ban'] = 'false';