houseassassin/vpnbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix subscriptions + redirect link

Browse Source
This commit is contained in:
mercury
2024-04-09 02:16:54 +04:00
parent 9749677b86
commit 228b617bfc
3 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/bot.php
+21 -17
View File
@@ -3505,30 +3505,28 @@ DNS-over-HTTPS with IP:
);
}
public function userXr($i, $fs = 0)
public function userXr($i, $fs = 0, $fv = 0)
{
$c = $this->getXray();
$domain = $this->getPacConf()['domain'] ?: $this->ip;
$scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
$hash = substr(md5($this->key), 0, 8);
$v2ray = "$scheme://{$domain}/pac?h=$hash&t=s&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}";
$sing = "$scheme://{$domain}/pac?h=$hash&t=si&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}";
$fullsing = 'sing-box://import-remote-profile/?url=' . urlencode("$scheme://{$domain}/pac?h=$hash&t=si&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}") . "#vpnbot$i";
$c = $this->getXray();
$domain = $this->getPacConf()['domain'] ?: $this->ip;
$scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
$hash = substr(md5($this->key), 0, 8);
$v2ray = "$scheme://{$domain}/pac?h=$hash&t=s&b=1&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}";
$sing = "$scheme://{$domain}/pac?h=$hash&t=si&b=1&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}";
$fullsing = 'sing-box://import-remote-profile/?url=' . urlencode("$scheme://{$domain}/pac?h=$hash&t=si&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}") . "#vpnbot$i";
$fullv2ray = 'v2rayng://install-config?url=' . urlencode("$scheme://{$domain}/pac?h=$hash&t=si&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}") . "#vpnbot$i";
if (!empty($fs)) {
return $fullsing;
}
if (!empty($fv)) {
return $fullv2ray;
}
$text[] = "Menu -> " . $this->i18n('xray') . " -> {$c['inbounds'][0]['settings']['clients'][$i]['email']}\n";
$text[] = "<code>{$this->linkXray($i)}</code>\n";
$text[] = "v2ray subscription: <code>$v2ray</code>";
$text[] = "sing-box subscription: <code>$sing</code>";
$text[] = "v2ray: <a href='$v2ray'>$v2ray</a>\n";
$text[] = "sing-box: <a href='$sing'>$sing</a>";
$data[] = [
[
'text' => 'sing-box subscription',
'web_app' => ['url' => "$scheme://{$domain}/pac?h=$hash&b=1&t=si&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}"],
],
];
$data[] = [
[
'text' => $this->i18n('show QR'),
@@ -3561,7 +3559,7 @@ DNS-over-HTTPS with IP:
);
}
public function v2raySubscription($key)
public function v2raySubscription($key, $fs = 0)
{
$pac = $this->getPacConf();
$domain = $pac['domain'] ?: $this->ip;
@@ -3570,6 +3568,9 @@ DNS-over-HTTPS with IP:
$flag = true;
foreach ($xr['inbounds'][0]['settings']['clients'] as $k => $v) {
if ($v['id'] == $key) {
if (!empty($fs)) {
return $this->userXr($k, 0, 1);
}
$flag = false;
break;
}
@@ -3691,6 +3692,8 @@ DNS-over-HTTPS with IP:
];
if (empty($c['routing']['rules'][0]['domain'])) {
unset($c['routing']['rules'][0]);
$c['routing']['rules'] = array_values($c['routing']['rules']);
}
echo json_encode($c);
}
@@ -3836,6 +3839,7 @@ DNS-over-HTTPS with IP:
];
if (empty($c['route']['rules'][1]['domain'])) {
unset($c['route']['rules'][1]);
$c['route']['rules'] = array_values($c['route']['rules']);
}
return json_encode($c);
}