Merge branch 'master' into singbox

This commit is contained in:
mercury
2024-07-07 15:38:48 +04:00
2 changed files with 10 additions and 4 deletions
+7 -3
View File
@@ -4856,9 +4856,13 @@ DNS-over-HTTPS with IP:
'callback_data' => "/import",
],
];
$backup = array_filter(explode('/', $conf['backup']));
if (!empty($backup)) {
$backup = "{$backup[0]} start / {$backup[1]} period";
}
$data[] = [
[
'text' => $this->i18n('backup') . ': ' . (implode(' / ', explode('/', $conf['backup'])) ?: $this->i18n('off')),
'text' => $this->i18n('backup') . ': ' . ($backup ?: $this->i18n('off')),
'callback_data' => "/backup",
],
];
@@ -4997,9 +5001,9 @@ DNS-over-HTTPS with IP:
{
$r = $this->send(
$this->input['chat'],
"@{$this->input['username']} enter like 1 day/00:00",
"@{$this->input['username']} enter like start / period",
$this->input['message_id'],
reply: 'enter like 1 day/00:00',
reply: 'enter like now / 12:00',
);
$_SESSION['reply'][$r['result']['message_id']] = [
'start_message' => $this->input['message_id'],
+3 -1
View File
@@ -1,6 +1,8 @@
ARG image
FROM $image
RUN apk add --no-cache --virtual .build-deps alpine-sdk git go \
COPY --from=golang:1.22.3-alpine /usr/local/go/ /usr/local/go/
ENV PATH="/usr/local/go/bin:${PATH}"
RUN apk add --no-cache --virtual .build-deps alpine-sdk git \
&& apk add iproute2 linux-headers iptables xtables-addons openssh wireguard-tools jq bash htop \
&& git clone https://github.com/amnezia-vpn/amneziawg-go \
&& git clone https://github.com/amnezia-vpn/amneziawg-tools.git \