Skip to content

0.6.4 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snoups merged 4 commits into from
Dec 22, 2025
Merged

0.6.4 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdb1972
fix: UI and signature validation for Cryptomus/Heleket
snoups Dec 21, 2025
dcc25fe
chore: bump remnapy to 2.3.3
snoups Dec 21, 2025
30e1589
fix: device deletion callback, branch variable, notifications
snoups Dec 22, 2025
c064604
chore: update README
snoups Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/prod-docker-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
ghcr.io/snoups/remnashop:${{ github.ref_name }}
build-args: |
BUILD_TIME=${{ steps.vars.outputs.build_time }}
BUILD_BRANCH=${{ github.ref_name }}
BUILD_BRANCH=main
BUILD_COMMIT=${{ steps.vars.outputs.short_sha }}
BUILD_TAG=${{ github.ref_name }}

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
```

> [!WARNING]
> **The latest version of the bot is compatible only with RemnaWave panel version 2.3.\***
> **The latest version of the bot is compatible only with RemnaWave panel version 2.3–2.4.x**
> Before installation, make sure your panel matches this version.


Expand Down
2 changes: 1 addition & 1 deletion README.ru_RU.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
```

> [!WARNING]
> **Последняя версия бота совместима только с панелью RemnaWave версии 2.3.\***
> **Последняя версия бота совместима только с панелью RemnaWave версии 2.3–2.4.x**
> Перед установкой убедитесь, что ваша панель соответствует этой версии.


Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies = [
"pydantic-settings~=2.11.0",
"redis~=7.0.0",
#"remnapy @ git+https://github.com/snoups/remnapy.git@development",
"remnapy>=2.3.2",
"remnapy>=2.3.3",
"taskiq[orjson]~=0.12.1",
"taskiq-redis~=1.2.0",
"uvicorn>=0.38.0",
Expand Down
2 changes: 1 addition & 1 deletion src/__version__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.6.3"
__version__ = "0.6.4"
1 change: 1 addition & 0 deletions src/bot/routers/dashboard/remnashop/gateways/dialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
text=I18nFormat("btn-gateways-webhook-copy"),
copy_text=Format("{webhook}"),
),
when=F["requires_webhook"],
),
Row(
SwitchTo(
Expand Down
1 change: 1 addition & 0 deletions src/bot/routers/dashboard/remnashop/gateways/getters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ async def gateway_getter(
"is_active": gateway.is_active,
"settings": gateway.settings.get_settings_as_list_data,
"webhook": config.get_webhook(gateway.type),
"requires_webhook": gateway.requires_webhook,
}


Expand Down
1 change: 1 addition & 0 deletions src/bot/routers/dashboard/users/user/dialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@
),
id="devices_list",
item_id_getter=lambda item: item["hwid"],
item_id_getter=lambda item: item["short_hwid"],
items="devices",
),
Row(
Expand Down
3 changes: 3 additions & 0 deletions src/bot/routers/dashboard/users/user/getters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ async def devices_getter(

formatted_devices = [
{
"short_hwid": device.hwid[:32],
"hwid": device.hwid,
"platform": device.platform,
"device_model": device.device_model,
Expand All @@ -197,6 +198,8 @@ async def devices_getter(
for device in devices
]

dialog_manager.dialog_data["hwid_map"] = formatted_devices

return {
"current_count": len(devices),
"max_count": i18n_format_device_limit(subscription.device_limit),
Expand Down
15 changes: 12 additions & 3 deletions src/bot/routers/dashboard/users/user/handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,16 @@ async def on_device_delete(
remnawave_service: FromDishka[RemnawaveService],
) -> None:
await sub_manager.load_data()
selected_device = sub_manager.item_id
selected_short_hwid = sub_manager.item_id
hwid_map = sub_manager.dialog_data.get("hwid_map")

if not hwid_map:
raise ValueError(f"Selected '{selected_short_hwid}' HWID, but 'hwid_map' is missing")

full_hwid = next((d["hwid"] for d in hwid_map if d["short_hwid"] == selected_short_hwid), None)

if not full_hwid:
raise ValueError(f"Full HWID not found for '{selected_short_hwid}'")

user: UserDto = sub_manager.middleware_data[USER_KEY]
target_telegram_id = sub_manager.dialog_data["target_telegram_id"]
Expand All @@ -228,8 +237,8 @@ async def on_device_delete(
if not target_user:
raise ValueError(f"User '{target_telegram_id}' not found")

devices = await remnawave_service.delete_device(user=target_user, hwid=selected_device)
logger.info(f"{log(user)} Deleted device '{selected_device}' for user '{target_telegram_id}'")
devices = await remnawave_service.delete_device(user=target_user, hwid=full_hwid)
logger.info(f"{log(user)} Deleted device '{full_hwid}' for user '{target_telegram_id}'")

if devices:
return
Expand Down
2 changes: 1 addition & 1 deletion src/bot/routers/menu/dialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
),
),
id="devices_list",
item_id_getter=lambda item: item["hwid"],
item_id_getter=lambda item: item["short_hwid"],
items="devices",
),
Row(
Expand Down
3 changes: 3 additions & 0 deletions src/bot/routers/menu/getters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ async def devices_getter(

formatted_devices = [
{
"short_hwid": device.hwid[:32],
"hwid": device.hwid,
"platform": device.platform,
"device_model": device.device_model,
Expand All @@ -110,6 +111,8 @@ async def devices_getter(
for device in devices
]

dialog_manager.dialog_data["hwid_map"] = formatted_devices

return {
"current_count": len(devices),
"max_count": i18n_format_device_limit(user.current_subscription.device_limit),
Expand Down
22 changes: 18 additions & 4 deletions src/bot/routers/menu/handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,26 @@ async def on_device_delete(
remnawave_service: FromDishka[RemnawaveService],
) -> None:
await sub_manager.load_data()
selected_device = sub_manager.item_id
selected_short_hwid = sub_manager.item_id
user: UserDto = sub_manager.middleware_data[USER_KEY]
hwid_map = sub_manager.dialog_data.get("hwid_map")

if user.current_subscription and user.current_subscription.device_limit:
await remnawave_service.delete_device(user=user, hwid=selected_device)
logger.info(f"{log(user)} Deleted self device '{selected_device}'")
if not hwid_map:
raise ValueError(f"Selected '{selected_short_hwid}' HWID, but 'hwid_map' is missing")

full_hwid = next((d["hwid"] for d in hwid_map if d["short_hwid"] == selected_short_hwid), None)

if not full_hwid:
raise ValueError(f"Full HWID not found for '{selected_short_hwid}'")

if not (user.current_subscription and user.current_subscription.device_limit):
raise ValueError("User has no active subscription or device limit unlimited")

devices = await remnawave_service.delete_device(user=user, hwid=full_hwid)
logger.info(f"{log(user)} Deleted device '{full_hwid}'")

if devices:
return

await sub_manager.switch_to(state=MainMenu.MAIN)

Expand Down
7 changes: 7 additions & 0 deletions src/infrastructure/database/models/dto/payment_gateway.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ class PaymentGatewayDto(TrackableDto):
is_active: bool
settings: Optional["AnyGatewaySettingsDto"] = None

@property
def requires_webhook(self) -> bool:
return self.type not in {
PaymentGatewayType.CRYPTOMUS,
PaymentGatewayType.HELEKET,
}


class GatewaySettingsDto(TrackableDto):
model_config = ConfigDict(validate_assignment=True)
Expand Down
4 changes: 2 additions & 2 deletions src/infrastructure/payment_gateways/cryptomus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
from src.core.enums import Currency, TransactionStatus
from src.infrastructure.database.models.dto import (
CryptomusGatewaySettingsDto,
HeleketGatewaySettingsDto,
PaymentGatewayDto,
PaymentResult,
)
from src.infrastructure.database.models.dto.payment_gateway import HeleketGatewaySettingsDto

from .base import BasePaymentGateway

Expand Down Expand Up @@ -138,7 +138,7 @@ def _verify_webhook(self, request: Request, data: dict) -> bool:
if not sign:
raise ValueError("Missing signature")

json_data = json.dumps(data)
json_data = json.dumps(data, separators=(",", ":"))
hash_value = self._generate_signature(json_data)

if not compare_digest(hash_value, sign):
Expand Down
23 changes: 11 additions & 12 deletions src/services/notification.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from typing import Any, Optional, Union, cast

from aiogram import Bot
from aiogram.exceptions import TelegramForbiddenError
from aiogram.types import (
BufferedInputFile,
InlineKeyboardButton,
Expand Down Expand Up @@ -151,15 +152,14 @@ async def error_notify(
#

async def _send_message(self, user: BaseUserDto, payload: MessagePayload) -> Optional[Message]:
reply_markup = self._prepare_reply_markup(
payload.reply_markup,
payload.add_close_button,
payload.auto_delete_after,
user.language,
user.telegram_id,
)
try:
reply_markup = self._prepare_reply_markup(
payload.reply_markup,
payload.add_close_button,
payload.auto_delete_after,
user.language,
user.telegram_id,
)

if (payload.media or payload.media_id) and payload.media_type:
sent_message = await self._send_media_message(user, payload, reply_markup)
else:
Expand All @@ -181,11 +181,10 @@ async def _send_message(self, user: BaseUserDto, payload: MessagePayload) -> Opt

return sent_message

except Exception as exception:
logger.error(
except TelegramForbiddenError as exception:
logger.exception(
f"Failed to send notification '{payload.i18n_key}' "
f"to '{user.telegram_id}': {exception}",
exc_info=True,
f"to '{user.telegram_id}': {exception}"
)
return None

Expand Down
8 changes: 4 additions & 4 deletions uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.