Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-08-24 11:56:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1631 commits 4 branches 89 tags 58 MiB
Commit graph

222 commits

Author SHA1 Message Date
somebodywashere
e09ac1d74f Small fixes (#2106) 2024-03-21 10:21:12 +03:30
somebodywashere
f0ab31b5da Fixed unnecessary Xray restarts in Tgbot 2024-03-15 21:13:20 +03:00
Hamidreza
8970f8f1a6 [iplimit] fix access log path in settings service (#2044) 
* [iplimit] fix access log path in settings service

better to avoid hardcoding the access log path to enhance flexibility. not all users prefer the default './access.log'

* [iplimit] fix iplimit
 2024-03-13 11:24:41 +03:30
Alireza Ahmadi
81e20b6b8b ip limit only if log is available 2024-03-12 21:53:32 +01:00
MHSanaei
74e0cbe4b8 bug fix - remove secret 2024-03-12 20:45:44 +03:30
MHSanaei
0ac68d2c99 [subJson] add mux and direct 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2024-03-12 19:44:51 +03:30
MHSanaei
8fd7c18039 minor changes 
Co-Authored-By: somebodywashere <68244480+somebodywashere@users.noreply.github.com>
 2024-03-12 17:51:45 +03:30
MHSanaei
e83de58528 avoid empty client id 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2024-03-11 11:52:28 +03:30
MHSanaei
7186d3cd75 [xray] add BurstObservatory + minor changes 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2024-03-11 11:46:54 +03:30
Hamidreza
d503bff637 Some fixes and improvements (#1997) 
* [refactor] api controller

* [fix] access log path

better to not hardcode the access log path, maybe some ppl dont want to use the default ./access.log

* [fix] set select options from logs paths in xray settings

* [update] .gitignore

* [lint] all .go files

* [update] use status code for jsonMsg and 401 to unauthorize

* [update] handle response status code via axios

* [fix] set correct value if log paths is set to 'none'

we also use the default value for the paths if its set to none

* [fix] iplimit - only warning access log if f2b is installed
 2024-03-11 01:01:24 +03:30
MHSanaei
68cf5e7349 default config domainStrategy 2024-03-11 00:08:57 +03:30
MHSanaei
5997b3484c Enhance CheckClientIpJob #1964 2024-03-02 21:16:28 +03:30
Ikko Eltociear Ashimine
8e338d2502 Update inbound.go (#1925) 
Clinet -> Client
 2024-02-27 15:03:37 +03:30
MHSanaei
34600e74f8 minor changes 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
Co-Authored-By: Tara Rostami <132676256+TaraRostami@users.noreply.github.com>
 2024-02-23 17:37:32 +03:30
MHSanaei
4146e72e9e bug fix #1595 2024-02-21 22:20:51 +03:30
MHSanaei
2dccd19dc9 [sub] json + fragment 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2024-02-21 14:17:52 +03:30
MHSanaei
755fea2f1c [xray] option error log 2024-02-18 01:13:39 +03:30
MHSanaei
38431ba9af minor changes 2024-02-18 01:11:43 +03:30
MHSanaei
0d9f0b4326 tgbot - Telegram api 7.1 changes 2024-02-17 21:15:53 +03:30
surbiks
3519fe657c add outbound traffic reset (#1767) 2024-02-07 11:25:31 +03:30
MHSanaei
dd50038568 xray config - statsOutbound 2024-02-04 13:02:28 +03:30
MHSanaei
d34e358c61 v2.1.3 2024-02-04 01:51:43 +03:30
MHSanaei
2495545cc5 Fix tgbot - document upload issue for empty ban logs 2024-02-04 01:50:14 +03:30
MHSanaei
77492579cc fix tgbot - no warning for empty socks5 2024-02-04 01:45:55 +03:30
MHSanaei
759234d0c5 new - select option for loglevel & access log 2024-02-04 01:45:55 +03:30
Saeid
23cf83c8f1 Show outbound traffic in outbounds table (#1711) 
* store outbound traffic in database

* show outbound traffic in outbounds table

* add refresh button
 2024-01-30 00:07:20 +03:30
MHSanaei
ae1062a02e bug fix - traffic limit tbbot 2024-01-29 23:36:03 +03:30
MHSanaei
fc7774cf08 unnecessary use of fmt.Sprintf 2024-01-26 17:06:54 +03:30
MHSanaei
690afb8142 fix - direct tag 2024-01-26 16:50:50 +03:30
MHSanaei
457d855107 [bug] avoid empty inbound 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2024-01-24 20:50:58 +03:30
Amin
dd8353f65a Fix inbounds with the same port and different IPs (#1595) 2024-01-17 16:21:28 +03:30
MHSanaei
513e8ebd53 WARP via wireguard 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2024-01-11 09:57:21 +03:30
Saeid
419493b71b socks5 proxy option added to telegram bot settings (#1500) 
* socks5 option added to telegram bot settings

* update socks5 proxy settings translations
 2024-01-03 16:29:29 +03:30
Ali Rahimi
9a6e9bd223 added Jalalian datepicker (shamsi) (#1460) 
* added datepicker option in setting page
jalalian datepicker component was added
translate files for datepicker updated

* dark mode bug fixed
 2024-01-02 12:02:21 +03:30
somebodywashere
071fd5d2ea Major changes to tgbot, also small changes for panel (#1463) 
* Reduce outage time on Xray errors

* Improved logs clearing, added previous logs
File name change: 3xipl-access-persistent.log -> 3xipl-ap.log
All previous logs have .prev suffix

* Preparations for tgbot additions

* [tgbot] Improvements, Additions and Fixes
* Changed interaction with Expire Date for Clients
* Added more info and interactions with Online Clients
* Added a way to get Ban Logs (also added them to backup)
* Few fixes and optimizations in code
* Fixed RU translation

* [tgbot] More updates and fixes

* [tgbot] Quick Fix

* [tgbot] Quick Fix 2

* [tgbot] Big Updates
Added Notifications for Clients throught Tgbot (when Expire)
Added compability for Usernames both w/wo @
Added more buttons overall for admins

* [tgbot] Fixes

* [tbot] Fixes 2

* [tgbot] Removed usernames support for Notifications to work

* [tgbot] Fix

* [tgbot] Fix Notify

* [tgbot] small fixes

* [tgbot] replyMarkup only for last message on big messages

* [tgbot] Fixed last message is empty

* [tgbot] Fix messages split
 2024-01-01 18:37:56 +03:30
Alireza Ahmadi
353fb7bde0 [xray] show xray errors #1300 2023-12-10 12:57:39 +01:00
Alireza Ahmadi
d647826eb7 remove xray embeded geo files #1300 2023-12-08 22:13:32 +01:00
Alireza Ahmadi
5cd8ce285c Update DB WAL before backup #1300 2023-12-08 20:35:10 +01:00
Alireza Ahmadi
18b2124f4f customizable remark #1300 2023-12-08 20:31:17 +01:00
Alireza Ahmadi
29de5a9cb9 import-export inbound #1300 2023-12-08 20:08:44 +01:00
Alireza Ahmadi
331b99a8cd small fixes #1300 2023-12-08 19:44:52 +01:00
Alireza Ahmadi
2e326f7e50 Expand multiDomain to externalProxy #1300 2023-12-08 18:45:21 +01:00
Alireza Ahmadi
509efebacb del x-ui settings in final tls/reality #1300 2023-12-08 17:21:43 +01:00
Alireza Ahmadi
8de5e4111f pagination and sub URI support #1300 2023-12-08 17:18:51 +01:00
Alireza Ahmadi
402e74c31d xray setting enhancements #1286 2023-12-05 18:20:44 +01:00
Alireza Ahmadi
6ba7f1198a separate xray page #1286 2023-12-04 19:20:46 +01:00
Alireza Ahmadi
ea66a1b23c auto renew feature #1286 2023-12-04 19:20:16 +01:00
Alireza Ahmadi
6dbc2fc3e3 online users backend #1286 2023-12-04 19:13:21 +01:00
Masoud Hidden
fd2c152a91 [bot] Some new features for telegram bot (#1241) 
* [bot] Some new features for telegram bot

+Ability to set traffic limit for client.
+Custom input for reset expire days.
+Custom input for reset IP limit.
+Added refresh time to the client ip log message.

* [bot] fix translations
 2023-11-20 17:47:59 +03:30
MHSanaei
a9ae95311f fixed telego 
after  github.com/mymmrac/telego from 0.26.3 to 0.27.0
 2023-10-25 23:03:17 +03:30
MHSanaei
d0fd8366f5 remove iran.dat 
so after this you need to click on "reset to default configuration"
 2023-10-18 13:22:07 +03:30
MHSanaei
fe2a0adb0a Add encrypt subscription ON/OFF switch 
Co-Authored-By: SudoSpace <79229394+sudospaes@users.noreply.github.com>
 2023-08-26 16:54:01 +03:30
MHSanaei
a4369085f0 some changes 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-08-26 16:07:02 +03:30
MHSanaei
e6a98904e1 [db] Enbancement add traffic fully transactional 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-08-26 15:19:51 +03:30
MHSanaei
951aaca621 [sub] improve usage info in Remark 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-08-26 15:11:12 +03:30
MHSanaei
00762ef282 add panel usage to main page 2023-08-09 00:37:05 +03:30
Hamidreza
3442b4a39a Add iran.dat when updating xray (#870) 
we can download iran.dat, because it's one of the required files in our settings
 2023-08-08 22:21:02 +03:30
MHSanaei
ed0dc2a7ee v1.7.5 2023-08-02 17:19:50 +03:30
MHSanaei
899536ef8f log level & syslog 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-07-31 20:11:47 +03:30
MHSanaei
05211b3170 fix logs in api 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-07-31 19:52:28 +03:30
MHSanaei
1094b3d2eb full multiuser shadowsocks 
full multiuser shadowsocks +
fix logs after api changes

Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-07-27 11:58:46 +03:30
MHSanaei
fc771dae3b because of #815 now we can use XTLS/Xray-core 
change MHSanaei/Xray-core to XTLS/Xray-core
 2023-07-27 11:06:27 +03:30
MHSanaei
63ce333037 [feature] using xray API for inbound 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-07-18 02:40:22 +03:30
Hamidreza
b0209fb0f9 🚀 Some improvements for x-ui.sh and ip job (#665) 2023-07-01 15:56:43 +03:30
MHSanaei
c8e3efe914 new - tg Login Notification #584 2023-06-17 19:11:16 +03:30
Ho3ein
eb92c3d14c new - loglevel (#612) 2023-06-16 18:25:33 +03:30
MHSanaei
f3a0142dbb fix and improve 2023-06-14 19:50:19 +03:30
MHSanaei
5a7d090347 removed - alterId 
https://github.com/XTLS/Xray-core/pull/2199
9112cfd39c
 2023-06-13 17:26:50 +03:30
MHSanaei
b531bf981f random sub Id 
optimize utils
trojan short id fix
index page better view
 2023-06-07 12:45:58 +03:30
MHSanaei
54da8ad9bd [feature] using xray api and more 
Improve DB performance
[api] backward compatibility: add client by update

Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-06-05 00:32:19 +03:30
somebodywashere
ff4f65083c [tgbot] - bugfix 2023-05-31 08:37:03 +00:00
Hamidreza
2bba2ec00c FIX tgbot adminIds 2023-05-31 05:01:20 +03:30
Hamidreza Ghavami
648494f555 add /id command to tgbot to get user id 2023-05-31 02:31:00 +04:30
Hamidreza Ghavami
b546d786eb add an option for webDomain 2023-05-31 01:21:14 +04:30
somebodywashere
1b41d3c964 [tgbot] - some fixes and improvments (#542) 2023-05-30 15:07:23 +03:30
MHSanaei
5e5a888357 New - CPU Speed 
logical Processors  removed
 2023-05-25 15:48:23 +03:30
MHSanaei
20bb72675c new - show cores, public ipv4 and ipv6 
logical Processors
you can see them on first page
 2023-05-25 03:11:09 +03:30
MHSanaei
f18dd8561d [feature] separate subscription service 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-05-22 18:06:34 +03:30
Hamidreza Ghavami
c0b3660c58 Update hashstorage functionality 2023-05-21 08:33:08 +04:30
Hamidreza Ghavami
15f101ed32 fix tgbot 2023-05-21 07:41:59 +04:30
Hamidreza Ghavami
e84132ea7c FIX ERROR 'msg and reply are same' in tgbot 2023-05-21 05:48:19 +04:30
Hamidreza Ghavami
e62305f16c FIX hashStorage remove expire job 2023-05-21 05:33:01 +04:30
Hamidreza Ghavami
9b7c8cad28 Update tgbot locale + add I18nBot 2023-05-21 03:30:26 +04:30
Hamidreza Ghavami
9bcef91cd7 FIX hashStorage 2023-05-20 21:46:42 +04:30
Hamidreza Ghavami
65ba44d423 FIX callback query and BUTTON_DATA_INVALID error with hashStorage 2023-05-20 20:29:28 +04:30
Hamidreza Ghavami
cc380b8c71 init i18n in tgbot 2023-05-20 20:08:01 +04:30
Hamidreza Ghavami
c95037f78f some fix and prune for tgbot 2023-05-20 19:39:01 +04:30
Hamidreza Ghavami
bf8251076e Add tgLang option 2023-05-20 19:15:20 +04:30
Hamidreza Ghavami
47edd393e6 update sub remark for shadowsocks 2023-05-20 18:44:18 +04:30
Mahdi Nemati
946d1bcc21 Api for backup Telegram (#468) 2023-05-19 00:31:05 +03:30
MHSanaei
f3feec2e0b update - config 2023-05-18 11:52:53 +03:30
MHSanaei
d274077066 [feature] SpiderX for Reality 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-05-17 16:10:11 +03:30
MHSanaei
3913128bbb [sub] add more headers 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-05-17 01:07:35 +03:30
Masoud Hidden
51aafb45f9 [tgbot] Fix reply keyboard height 2023-05-14 22:55:01 +03:30
Masoud Hidden
0693bd540e [tgbot] Ability to remove telegram user from the client in the bot 2023-05-14 22:43:23 +03:30
Masoud Hidden
58fda2f1ee [tgbot] Ability to select telegram user for client from bot 2023-05-14 22:07:49 +03:30
Masoud Hidden
fbb2ec1e39 [tgbot] Changed to telego 2023-05-14 18:50:01 +03:30
MHSanaei
a21fecf91e remove search Data files 2023-05-13 15:03:46 +03:30
MHSanaei
e2de4b1f74 [bug] fix login failure when tgbot is not active 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-05-13 13:31:46 +03:30
Hamidreza Ghavami
22e5978f6c Update README.md 2023-05-12 22:45:32 +04:30