Commit Graph
100 Commits
Author SHA1 Message Date
machka paslaandGitHub 3e86fc76b6 Merge pull request #135 from machka-pasla/dev
upd
2025-11-13 23:04:43 +03:00
machka paslaandGitHub 829a18715a Merge pull request #134 from machka-pasla/revert-133-revert-132-fix/sync-admin-duplicate-subscriptions
Revert "Revert "Устранены дубли активных записей, ошибка уникальности и улучшена идемпотентность""
2025-11-13 23:04:13 +03:00
machka paslaandGitHub 844c8e12a7 Revert "Revert "Устранены дубли активных записей, ошибка уникальности и улучшена идемпотентность"" 2025-11-13 23:03:56 +03:00
machka paslaandGitHub ef75f905f4 Merge pull request #133 from machka-pasla/revert-132-fix/sync-admin-duplicate-subscriptions
Revert "Устранены дубли активных записей, ошибка уникальности и улучшена идемпотентность"
2025-11-13 23:01:58 +03:00
machka paslaandGitHub cd816cbe5c Revert "Устранены дубли активных записей, ошибка уникальности и улучшена идемпотентность" 2025-11-13 23:01:46 +03:00
machka paslaandGitHub 2b0fa3a314 Merge pull request #132 from orryxvpn/fix/sync-admin-duplicate-subscriptions
Устранены дубли активных записей, ошибка уникальности и улучшена идемпотентность
2025-11-13 23:01:30 +03:00
machka paslaandGitHub ead990e61c Merge pull request #129 from 3252a8/feature/ref-link
Ref link improvement
2025-11-13 23:00:43 +03:00
machka paslaandGitHub 183bef070d Merge pull request #124 from machka-pasla/dev
yookassa bug fix and other
2025-11-10 15:49:45 +03:00
machka paslaandGitHub 73ce689d5e Merge pull request #120 from streletskiy/feature/user-profile-links
Feature/user profile links
2025-11-03 17:27:49 +03:00
machka paslaandGitHub c0d70030c3 Merge pull request #117 from machka-pasla/dev
Dev
2025-10-30 20:46:31 +03:00
machka paslaandGitHub 4e7c36dbf7 Merge pull request #115 from streletskiy/feature/paged-users-list
Paged list of all users
2025-10-30 17:57:00 +03:00
machka paslaandGitHub c65b608f0b Merge pull request #114 from machka-pasla/dev
more payment info in admin, docker compose for other servers, fixed channel sub check
2025-10-28 14:40:59 +03:00
machka paslaandGitHub 2f367bbd6b Merge pull request #112 from streletskiy/feature/display-user-income
Additional payment info in admin panel user card
2025-10-28 14:31:47 +03:00
machka paslaandGitHub 70a0cd44a1 Merge pull request #111 from freize/main
An example Docker file for deploying a bot on a separate server
2025-10-25 20:02:43 +03:00
machka paslaandGitHub 545c9c7d07 Merge pull request #109 from Snowy-Fluffy/custom-payment-id
Добавление возможности выставлять ID способа оплаты для FreeKassa в env
2025-10-25 20:02:14 +03:00
machka paslaandGitHub cdfd94c814 Merge pull request #108 from machka-pasla/dev
fixed locales and traffic after adding days
2025-10-24 10:34:25 +03:00
machka paslaandGitHub f321fd04cf Merge pull request #107
fixed ad
2025-10-21 09:45:32 +03:00
machka paslaandGitHub 17bf8720a3 Merge pull request #105 from machka-pasla/dev
fixed my devices keyboard
2025-10-20 22:28:36 +03:00
machka paslaandGitHub d672032201 Merge pull request #104 from machka-pasla/dev
Added freekassa, HWID Devices managment, mandatory sub to channel
2025-10-18 22:45:02 +03:00
machka paslaandGitHub b880032b9b Merge pull request #103 from gldkru/feature/sub-devices-managment
Add 'My Devices' feature to user subscription management
2025-10-18 21:32:48 +03:00
machka paslaandGitHub 394e8dcc6c Merge pull request #100 from zerodata731/freekassa-codex
Freekassa codex
2025-10-14 09:38:47 +03:00
machka paslaandGitHub 5f3fc13c2b Merge branch 'dev' into freekassa-codex 2025-10-14 09:38:39 +03:00
machka paslaandGitHub d50324d098 Merge pull request #99 from zerodata731/freekassa-codex
v_0.0
2025-10-13 10:05:45 +03:00
machka paslaandGitHub a3406451cb Merge pull request #98 from machka-pasla/dev
auto renew message with trial fix
2025-10-10 20:05:26 +03:00
machka paslaandGitHub 1d57c9be21 Merge pull request #96 from machka-pasla/dev
name filtration
2025-10-09 21:11:17 +03:00
Machka PaslaandGitHub 67df164498 Merge pull request #94 from machka-pasla/dev
tribute grace fix
2025-09-28 19:24:45 +03:00
Machka PaslaandGitHub c2a475b062 Merge pull request #90 from machka-pasla/dev
Bugfixes
2025-09-12 13:15:04 +03:00
Machka PaslaandGitHub 2215ee8ad2 Merge pull request #89 from machka-pasla/dev
Автопродление подписки при платеже через ЮКассу, микрофиксы и прочее-прочее
2025-09-11 09:58:05 +03:00
Machka PaslaandGitHub 1b6acff6d4 Merge pull request #88 from ProtoPes/add-dockerignore
Добавление файла .dockerignore
2025-09-08 22:36:03 +05:00
Machka PaslaandGitHub 25d9cc7446 Update .dockerignore
оставил локали, потому что не всегда идет прокидывание локалей через докер вольюм
2025-09-08 22:35:43 +05:00
Machka PaslaandGitHub cc21089f18 Merge pull request #84 from freize/patch-1
Correction of translation into Russian.
2025-09-07 23:10:20 +05:00
Machka PaslaandGitHub 46120210f1 Merge pull request #85 from freize/patch-2
Correction of the English translation.
2025-09-07 23:09:40 +05:00
Machka PaslaandGitHub df43283971 Update .env.example 2025-09-07 23:08:10 +05:00
Machka PaslaandGitHub a51b20ee54 Merge pull request #86 from freize/patch-3
Update .env.example
2025-09-07 23:06:26 +05:00
Machka PaslaandGitHub 0915022b52 Merge branch 'dev' into patch-3 2025-09-07 23:05:49 +05:00
Machka PaslaandGitHub dba82cfb97 Create LICENSE
MIT
2025-09-04 15:04:53 +03:00
Machka PaslaandGitHub dace4c2938 Merge pull request #82 from machka-pasla/dev
I HATE tribute
2025-09-01 21:26:30 +03:00
Machka PaslaandGitHub f191c1813e Merge pull request #79 from ProtoPes/add-referral-check
Added check for referral user, small refactoring
2025-08-26 20:38:45 +03:00
Machka PaslaandGitHub 5c74a08ed8 Merge pull request #78 from machka-pasla/dev
Implement user creation and synchronization enhancements in admin syn…
2025-08-26 18:14:40 +03:00
Machka PaslaandGitHub 711b9a2487 Merge pull request #77 from machka-pasla/dev
Update broadcast and some other small bugs 🪲
2025-08-25 14:13:27 +03:00
Machka PaslaandGitHub 459b655ae3 Merge pull request #76 from machka-pasla/dev
add new referral param and broadcast for groups of users
2025-08-19 14:54:30 +03:00
Machka PaslaandGitHub cb6ae1e052 Update README.md 2025-08-18 15:22:29 +03:00
Machka PaslaandGitHub 70d472e71c Merge pull request #71 from machka-pasla/dev
i hate tribute
2025-08-09 22:32:58 +03:00
Machka PaslaandGitHub dbb27ee9ca Merge pull request #70 from machka-pasla/dev
Broadcast fix
2025-08-09 10:00:30 +03:00
Machka PaslaandGitHub 08810eb2e0 Merge pull request #69 from machka-pasla/dev
Update promo_edit_field_handler to clarify callback data structure
2025-08-07 23:57:59 +03:00
Machka PaslaandGitHub 6330d57c60 Merge pull request #68 from machka-pasla/dev
Tribute hotfix, payments logs
2025-08-07 23:51:55 +03:00
Machka PaslaandGitHub 60ea6fff0d Merge pull request #67 from machka-pasla/dev
fix bug
2025-08-06 20:22:20 +03:00
Machka PaslaandGitHub 74548527f1 Merge pull request #66 from machka-pasla/dev
autosync and bug fixes
2025-08-06 18:51:27 +03:00
Machka PaslaandGitHub f8e3bee52a Update .env.example 2025-08-06 18:49:21 +03:00
Machka PaslaandGitHub 5c8099168d Merge pull request #63 from machka-pasla/dev
Dev
2025-08-06 01:24:06 +03:00
Machka PaslaandGitHub c969d52ce1 Update README.md 2025-08-05 23:50:11 +03:00
Machka PaslaandGitHub 0c31256fd1 Merge pull request #62 from machka-pasla/dev
2.0.0 update
2025-08-05 23:36:31 +03:00
Machka PaslaandGitHub 35d798a429 Merge pull request #59 from machka-pasla/e4i3yn-codex/update-api-service-and-.env-variables
Update API service for squads
2025-07-29 15:31:49 +03:00
Machka Pasla b34eb733b9 Update API service for new squads API 2025-07-29 15:31:26 +03:00
Machka PaslaandGitHub fcd456dce9 Merge pull request #58 from machka-pasla/7was2g-codex/check-aiohttp-and-asyncio-interactions
Close services and update event loop usage
2025-07-29 14:45:50 +03:00
Machka Pasla 8246e9a590 Close sessions for all services on shutdown 2025-07-29 14:44:55 +03:00
Machka PaslaandGitHub 14f244ab79 tribute logger 2025-07-27 21:30:21 +03:00
Machka PaslaandGitHub 956ec5ea71 Update requirements.txt 2025-07-25 20:25:20 +03:00
Machka PaslaandGitHub 2ef420ff47 Merge pull request #49 from machka-pasla/dependabot/pip/aiohttp-3.12.14
Bump aiohttp from 3.10.11 to 3.12.14
2025-07-25 20:23:55 +03:00
Machka PaslaandGitHub 7de1cdf9d6 Merge pull request #54 from machka-pasla/codex/use-fiat-asset-instead-of-crypto-asset
Support fiat invoices in Crypto Pay
2025-07-25 13:16:00 +03:00
Machka Pasla 860c2298bd Support fiat invoices in Crypto Pay 2025-07-25 13:15:46 +03:00
Machka PaslaandGitHub 2eff9300d3 Merge pull request #53 from machka-pasla/por3bg-codex/integrate-crypto-bot-with-crypto-pay-api
Fix CryptoPay import path
2025-07-25 12:53:48 +03:00
Machka PaslaandGitHub 1bd09be005 Merge branch 'main' into por3bg-codex/integrate-crypto-bot-with-crypto-pay-api 2025-07-25 12:53:41 +03:00
Machka Pasla ce571f6566 Fix CryptoPay import 2025-07-25 12:52:51 +03:00
Machka PaslaandGitHub 856129fce2 Merge pull request #52 from machka-pasla/codex/integrate-crypto-bot-with-crypto-pay-api
Add Crypto Pay integration
2025-07-25 12:17:36 +03:00
Machka Pasla b67f659746 Refine CryptoBot labels and .env layout 2025-07-25 12:16:39 +03:00
Machka PaslaandGitHub a102903814 hotfix 2025-07-22 21:58:19 +03:00
Machka PaslaandGitHub 3e6ef9de32 Merge pull request #48 from machka-pasla/l9vj54-codex/refactor-payment-success-messages
Refine payment success flow
2025-07-21 10:15:16 +03:00
Machka Pasla 9cf395c103 Use full payment messages and remove unused locales 2025-07-21 10:14:59 +03:00
Machka PaslaandGitHub 69429dce81 Merge pull request #47 from machka-pasla/codex/update-purchase-confirmation-messages
Integrate referral info into purchase message
2025-07-20 21:05:49 +03:00
Machka Pasla d3bfe774c7 Refine purchase and promo messages 2025-07-20 21:04:52 +03:00
Machka PaslaandGitHub e2df8a01c8 Merge pull request #46 from machka-pasla/codex/improve-ux-after-purchase-confirmation
Improve subscription purchase flow
2025-07-20 13:11:30 +03:00
Machka Pasla dbeee31081 Improve post-purchase message 2025-07-20 13:10:44 +03:00
Machka PaslaandGitHub aa5a68c32c Merge pull request #45 from machka-pasla/codex/refactor-subscription-notifications-style
Update subscription expiration notifications
2025-07-12 10:02:00 +07:00
Machka Pasla a7b4863889 Add subscribe reminder buttons and update notifications 2025-07-12 10:01:25 +07:00
Machka PaslaandGitHub 16a00efcc9 Merge pull request #44 from machka-pasla/codex/log-event-and-telegramid-if-available
Log panel webhook event and telegram ID
2025-07-12 00:36:33 +07:00
Machka Pasla 2779e62e43 Log panel webhook events 2025-07-12 00:35:41 +07:00
Machka PaslaandGitHub d7fdcc25cd Merge pull request #43 from machka-pasla/7ql8c7-codex/fix-webhook-without-telegramid-warning
Fix webhook user extraction and notification logic
2025-07-12 00:24:48 +07:00
Machka PaslaandGitHub 24c4bbc27e Merge branch 'main' into 7ql8c7-codex/fix-webhook-without-telegramid-warning 2025-07-12 00:24:40 +07:00
Machka Pasla 5b08ad5449 Fix panel webhook user data parsing 2025-07-12 00:22:35 +07:00
Machka PaslaandGitHub fa321426b8 Merge pull request #42 from machka-pasla/codex/fix-webhook-without-telegramid-warning
Handle panel webhook data variant
2025-07-12 00:06:28 +07:00
Machka Pasla a4839ffc63 Fix panel webhook user data parsing 2025-07-12 00:06:11 +07:00
Machka PaslaandGitHub 0aa38d3806 Merge pull request #41 from machka-pasla/qrbsms-codex/add-user-notifications-for-expiration-webhooks
Handle panel webhook variants
2025-07-11 23:41:38 +07:00
Machka Pasla c7b124ad4c Handle panel webhook variants and remove Tribute cancel 2025-07-11 23:40:33 +07:00
Machka PaslaandGitHub b5b740611c Merge pull request #39 from machka-pasla/codex/add-promo-code-activation-notifications
Add promo activation and tribute/star payment notifications
2025-07-11 19:29:29 +07:00
Machka Pasla 68459a7075 Add admin notifications for promos and non-YK payments 2025-07-11 19:28:45 +07:00
Machka PaslaandGitHub 0e84a480fc Merge pull request #38 from machka-pasla/codex/fix-unhandled-telegrambadrequest-exception
Fix HTML name escaping
2025-07-09 14:34:06 +07:00
Machka Pasla 1ac368354d Escape user names in HTML messages 2025-07-09 14:33:53 +07:00
Machka PaslaandGitHub 831e61cd99 Merge pull request #37 from machka-pasla/codex/refactor-payment-logic-for-subscription-periods
Update Tribute webhook period parsing
2025-07-08 19:09:57 +07:00
Machka Pasla 981d63c53e Update Tribute webhook period parsing 2025-07-08 19:09:43 +07:00
Machka PaslaandGitHub 4d8cf45bda Merge pull request #31 from machka-pasla/codex/remove-auto-renew-for-attribute
Disable tribute auto-renew and add admin alerts
2025-07-06 13:31:14 +07:00
Machka Pasla df987fc52a Remove tribute auto renew and add admin notifications 2025-07-06 13:31:04 +07:00
Machka PaslaandGitHub 07cb68457f Merge pull request #30 from machka-pasla/codex/уточнить-работу-автопродления-с-tribute
Implement auto-renewal for Tribute
2025-07-05 00:05:51 +07:00
Machka Pasla 1e666f90d3 Improve Tribute auto-renew 2025-07-05 00:05:33 +07:00
Machka PaslaandGitHub 6241f766a2 Merge pull request #29 from machka-pasla/codex/add-description-support-for-/start-command
Fix mini app registration
2025-07-04 22:45:19 +07:00
Machka Pasla 451581f792 Fix mini app registration 2025-07-04 22:43:04 +07:00
Machka PaslaandGitHub a015946b20 Merge pull request #28 from machka-pasla/codex/add-description-support-for-/start-command
Enable mini app via API without menu change
2025-07-04 22:35:48 +07:00
Machka Pasla d1d701bff3 feat: allow /start description and keep menu default 2025-07-04 22:35:13 +07:00
Machka PaslaandGitHub ea50567a42 Merge pull request #26 from machka-pasla/codex/добавить-поддержку-mini-app-для-подписки
Support subscription mini app
2025-07-04 20:45:59 +07:00
Machka Pasla a8b62ccc03 Add subscription mini app support 2025-07-04 20:45:27 +07:00