Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-23 00:51:01 +03:00
Code Issues Projects Releases Packages Wiki Activity
2814 commits 12 branches 101 tags 13 MiB
Commit graph

1205 commits

Author SHA1 Message Date
Gravita
8fb1349487 [FIX] Roles support 2022-11-21 13:44:58 +07:00
Gravita
5631bc6af1 [FIX] permissionsPermissionColumn 2022-11-21 13:32:10 +07:00
AlexCatze
9cc1810831
[FEATURE] Roles support for MySQL and PostgreSQL (#622) 
* [FEATURE] Roles support for MySQL and PostgreSQL

Roles are stored in separate (name,uuid) table. Role can be given to user by adding "role.<name/guid>" permission to user. Permissions can be added to role by adding record with role`s uuid to permissions table.

* [REFACTOR] Refactor roles quering

Use 2 queries, first to query names of all user`s roles, second to recursively query all permissions. This also allows roles inheritance. All code from previous realisation, that is not used in this one, was commented, so if this realisation will be accepted, that code can be finaly removed.

* [REFACTOR] Removed commented code

* [REFACTOR] Remover useless catches
 2022-11-19 18:01:32 +07:00
Gravita
a7d3cba949 [FEATURE] Directory launcher-pack 2022-11-18 16:06:42 +07:00
Gravita
10888ed2e7 [ANY] Full IDEA reformat 2022-11-18 14:47:03 +07:00
Gravita
82accb211d [ANY] IDEA reformat 2022-11-18 14:39:35 +07:00
Gravita
10df931c2a [FIX] MySQL/PostgreSQL permissions 2022-11-18 14:38:39 +07:00
AlexCatze
40d4681bce [FEATURE] Move shared SQL code to abstract class 
Also ports permissions support to MySQL, because it doen`t have PostgreSQL-specific code.
 2022-11-14 21:14:53 +02:00
AlexCatze
d11c9e92a5
[FEATURE] Add permissions support to PostgreSQL 
This commit adds permissions support to PostgreSQL auth method.
 2022-11-13 19:52:20 +01:00
Gravita
6fb9174681 [FEATURE] AuthSupportRemoteClientAccess 2022-10-07 18:55:42 +07:00
Gravita
36d97e7f8b [FEATURE] Profiles refresh 2022-10-01 16:40:19 +07:00
Gravita
86f9f20b52 [FEATURE] BCryptPasswordVerifier 2022-09-28 16:53:56 +07:00
microwin7
6d5ae93889
[FIX] JRE Full Download URL Update (#607) 
Which is based on OpenJFX and Minimal VM
 2022-09-01 14:04:27 +07:00
Gravita
2324af1c46 [FIX] Bug fixes 2022-08-30 14:26:08 +07:00
Gravita
230194f2a0 [FEATURE] Update rework 2022-08-24 13:41:01 +07:00
Clercq
9bac9e3bef
[FIX] HttpAuthCoreProvider (#603) 2022-08-12 16:22:50 +07:00
Clercq
385f2d9ec5
Add to HttpAuthCoreProvider the AuthSupportHardware implementation (#601) 
* initial

* test fixes

* review fixes

* review fixes

* test fixes

* review fixes

* review fixes
 2022-08-01 15:54:07 +07:00
Gravita
81b80a7938 [FEATURE] Download assets from mojang 2022-07-30 16:15:35 +07:00
Gravita
c8768326ea [FEATURE] 5.3.0 features 2022-07-24 16:27:24 +07:00
Gravita
afd147f92e [FIX] Small fixes 2022-06-29 17:36:45 +07:00
Gravita
0b38781858 [FIX] HttpAuthCoreProvider small fixes 2022-06-08 23:17:35 +07:00
Gravita
44ba945b58 [FEATURE] DebugCommand 2022-05-31 17:07:52 +07:00
microwin7
3a43ebff45 [FIX][STYLE] Minimal recommend JAVA for 1.18+ set 17 2022-05-29 06:44:25 +03:00
Gravita
8379a6efec [FIX] Client permissions 2022-04-11 20:43:35 +07:00
Gravita
8a51c98df8 [ANY] Remove deprecated 2022-04-11 19:28:47 +07:00
Gravita
5e6ab3763e [FIX] DiscordBotConsole 2022-04-10 22:14:55 +07:00
Gravita
a20b70e2a1 [FEATURE] HttpAuthCoreProvider toString() methods 2022-04-07 22:16:25 +07:00
Gravita
b135535147 Upgrade dependencies 2022-04-03 15:44:57 +07:00
Gravita
7cd6b9c1d9 [FIX] Bad login (MySQL + HWID) 2022-04-03 15:08:15 +07:00
Gravita
7bfa4ebdab [FIX] Bad login (MySQL + HWID) 2022-03-30 16:39:48 +07:00
Gravita
8afa630546 [FIX] Bad login (MySQL + HWID) 2022-03-30 15:52:28 +07:00
Gravita
9b3b49966a [FIX] RefreshToken 2022-03-18 20:03:36 +07:00
Gravita
f6ee175acd [FIX] UTC Clock 2022-03-18 19:54:56 +07:00
Gravita
736bf51eaa [FIX] UTC Timezone 2022-03-18 19:50:46 +07:00
Gravita
96915b0f78 [FIX] PostgresSQLCoreProvider and HttpAuthCoreProvider bug fixes 2022-03-18 19:02:58 +07:00
Gravita
6430b9e2d4 Merge branch 'feature/removelegacysession' into dev 2022-03-18 18:28:27 +07:00
Gravita
a54d7ba89a [FEATURE] PlayerProfile properties, User assets 2022-03-17 23:28:16 +07:00
Gravita
2b117f6717 [FEATURE] UserSupportProperties extension 2022-03-17 22:55:30 +07:00
Gravita
6086b15c9f [FIX] Deprecate RestoreSession 2022-03-17 21:27:08 +07:00
Gravita
62094e0cf6 [FEATURE] Remove legacy session 2022-03-17 21:07:54 +07:00
Gravita
6aed114791 [FEATURE] MySQL and PostgreSQL AuthCoreProvider use OAuth 2022-03-17 20:57:20 +07:00
Gravita
afbed1345f [FEATURE] Support customJvmOptions 2022-03-17 19:30:10 +07:00
microwin7
999d7b7795
[FIX] MySQL remove limit 1 for update query 2022-01-24 09:10:26 +03:00
Gravita
07bfd0b340 [ANY] Update mirror 2022-01-12 20:45:13 +07:00
Gravita
2b95c58f28 [FIX] MicrosoftAuthCoreProvider 2022-01-12 02:15:01 +07:00
Gravita
4cb47d5891 [ANY] Set default mirror 2022-01-06 23:25:57 +07:00
Gravita
b496d60b40 [ANY] New client format support, fix fabric 2021-12-13 00:58:38 +07:00
Gravita
ce4f4cab62 [FIX] Postgresql no hwidId need 2021-12-10 20:57:21 +07:00
Gravita
796b2e2533 [FEATURE] Postgresql support 2021-12-10 20:46:49 +07:00
Gravita
fbb24bb904 [ANY] Deprecated old features 2021-11-10 23:44:19 +07:00
Gravita
f30daab0f7 [FIX] Proguard jdk dir specified twice 2021-11-10 23:32:26 +07:00
Gravita
50d8f12536 [FIX] Remove HWIDProvider 2021-11-10 23:14:26 +07:00
Gravita
ac1279ff5c [FIX] HttpAuthCoreProvider 2021-11-09 14:32:09 +07:00
Gravita
f8569f9165 [FEATURE] GSON serialize Record 2021-11-09 14:12:31 +07:00
Gravita
2d0957f834 [FIX] MemoryAuthCoreProvider 2021-11-09 12:22:18 +07:00
Gravita
2a2c2f6b93 [FEATURE] AuthCoreProvider rework 2021-11-05 22:19:00 +07:00
Gravita
15da924aa6 [FIX] AcceptPasswordVerifier 2021-10-23 17:27:08 +07:00
Gravita
618e981de5 [FIX] AuthProviderPair logger is null 2021-10-18 14:44:35 +07:00
Gravita
e5b603e2a9 [FEATURE] Use UUID for checkServer token 2021-10-17 16:53:33 +07:00
BartolomeoDR
af2155c4bf
[FIX] Fixed user is unable to play after logout 
Right now refCount value is set to 1, and inside handler.setClient its being incremented to 2. Because of that refCount check never goes to 0, and so current session is never stored ( as only single handler has this client, and not two ).
 2021-10-16 14:32:57 +03:00
BartolomeoDR
d1bc03664b
Update Client.java 
Added ability to customize refCount value of a client
 2021-10-16 14:27:48 +03:00
Gravita
1a7160c394 [FIX] Small UI improvements 2021-10-15 21:35:47 +07:00
Gravita
7d8975041f [FIX] Deprecation warning 2021-10-15 21:29:26 +07:00
Gravita
d9a8e161f1 [FEATURE] Improvements for token command 2021-10-15 21:25:27 +07:00
Gravita
b5aeac3ff2 [FIX] Correct error in checkServer 2021-10-15 21:05:26 +07:00
Gravita
112ac31803 [FIX] needMoreFactors 2021-10-13 21:28:43 +07:00
Gravita
26ed69e1a7 [FIX] FileAuthSystem module permissions 2021-10-13 20:01:12 +07:00
Gravita
dabe2e8106 [FIX] Ping Server 2021-10-12 17:34:44 +07:00
Gravita
58dfc472ac [FIX] ServerWrapper connect to ServerProfile 2021-10-12 17:09:19 +07:00
Gravita
9841ef3157 [FEATURE] Permissions 2021-10-12 16:55:32 +07:00
Gravita
a94b6e8836 [FEATURE][EXPERIMENTAL] Microsoft account support 2021-09-30 19:39:35 +07:00
Gravita
dfd565d44f [FIX] Bug fixes 2021-09-25 18:46:07 +07:00
Gravita
958686a032 [FEATURE][EXPERIMENTAL] New ServerWrapper auth system 2021-09-25 17:40:08 +07:00
Gravita
4c78d00360 [FEATURE] Pattern-based permissions system 2021-09-22 16:50:05 +07:00
Gravita
39ac6cdad8 [FEATURE] FileAuthSystem improvements 2021-09-22 13:52:17 +07:00
Gravita
4bd84728f3 [REFACTOR] Remove deprecated methods 2021-09-22 13:06:45 +07:00
Gravita
9b55e243e7 [REFACTOR] Remove AuthProvider/AuthHandler support 2021-09-22 12:45:48 +07:00
Gravita
fbbde7991e [REFACTOR] Upgrade to Java 17 2021-09-22 12:19:18 +07:00
Gravita
3cce0e93f3 [ANY] 5.2.2 stable 2021-09-22 11:15:10 +07:00
Gravita
11af2943db [ANY] Update gradle 2021-09-14 18:05:36 +07:00
Gravita
f0ae4cbb12 [FIX] AuthManager NPE 2021-09-12 17:52:28 +07:00
Gravit
acf106baa9
Merge pull request #515 from microwin7/dev 
Update dependencies and fix HikariCP
 2021-09-04 19:59:29 +07:00
Gravita
8694963313 [FIX] TextureProvider NPE error message 2021-09-04 19:54:48 +07:00
microwin7
c44162dbbe [FIX] build.gradle 2021-09-04 09:03:33 +03:00
microwin7
6211744b83 [FIX] build.gradle 2021-09-04 09:02:58 +03:00
microwin7
f279e97ea2 [ANY] Update common modules and FileAuthSystem_module README.md 2021-09-04 08:57:35 +03:00
microwin7
ad5c2382cf [FIX] AdditionalHash_module 2021-09-04 08:54:34 +03:00
microwin7
62991ed709 [FIX] MySQLSourceConfig HikariCP 2021-09-04 08:51:34 +03:00
Gravita
fb7a552843 [FIX] JsonAuthCoreProvider Bearer header 2021-08-23 15:56:08 +07:00
Gravita
dc3d75c650 [FIX] getParamsFromUri UTF-8 2021-08-17 15:05:27 +07:00
Gravita
3e973c5de3 [FIX] NPE Issue #506 2021-08-14 03:25:31 +07:00
Gravita
b7621ef760 [FIX] pro.gravit.launcher.debug 2021-08-10 04:30:55 +07:00
Gravita
a915d41b93 [FIX] JsonAuthCoreProvider joinServer/checkServer 2021-08-08 16:10:07 +07:00
Gravit'a
9fff11e887 [FIX] JsonCoreProvider verifyPassword 2021-08-08 14:53:25 +07:00
Gravit'a
19344b9d27 [FIX] jsonRequest 2021-08-07 03:02:47 +07:00
Gravita
4dd30faf7e [FEATURE][EXPERIMENTAL] Support slim skins 2021-07-27 04:26:10 +07:00
Gravita
b0538abe63 [FEATURE] Performance: Skin/Cloak local load 2021-07-27 04:26:10 +07:00
Zaxar163
eb9871123b
[ANY] Небольшой рефактор. 
Обнаружил isClient и IS_CLIENT, ещё пару подобных пережитков...
 2021-07-21 19:43:47 +03:00
Gravita
30ec6409fd [FIX] makeprofile fabric fix 2021-07-11 23:33:31 +07:00
Gravita
9112ca0c88 [FEATURE] launcherinstaller fabric 2021-07-11 18:35:36 +07:00
Gravita
afa0cd0366 [FEATURE] Downloader ProgressBar 2021-07-11 17:07:54 +07:00
Gravita
7f1583c0a3 [ANY] Обновлены библиотеки 2021-07-11 16:00:58 +07:00
Gravita
8085b50b3d [FEATURE] MakeProfileHelper 2021-07-11 15:35:51 +07:00
Gravita
0cc47a7b06 [FIX] JavaHelper Windows 2021-07-09 17:18:29 +07:00
Gravita
736aa93106 [FEATURE] MakeProfileCommand 2021-07-09 15:35:00 +07:00
Gravita
442ff9b752 [FIX] Compilation fix 2021-07-04 22:19:33 +07:00
Gravita
602a4b17f8 [FEATURE] DialogService, AdditionalDataRequest 2021-07-04 20:01:24 +07:00
Gravita
f82d5dfa03 [ANY] Small IDEA Code Inspect 2021-06-23 11:05:44 +07:00
Gravita
3f0c972b08 [FEATURE] WhitelistComponent 2021-06-22 12:09:34 +07:00
Gravita
b4718a8062 [FIX] SecurityCheck command 2021-06-22 11:45:04 +07:00
Gravita
81be9d21de [FIX] MySQLCoreProvider HWID fix 2021-06-22 11:13:12 +07:00
Gravit
0c281ab50d
[FIX] Small fixes 2021-06-21 14:14:25 +07:00
Gravit
e36cfea4f9
[FIX] Bad Login (Clientside) in MySQLAuthCoreProvider 2021-06-20 12:01:39 +07:00
Gravit
867f367860
[FIX] Logger.error 2021-06-20 10:42:13 +07:00
Gravit
7133727edd
[FEATURE] Configurable query MySQL AuthCoreProvider 2021-06-20 10:13:53 +07:00
Gravita
5abc456c3b [FIX] DoubleDigestPasswordVerifier 2021-06-18 16:57:30 +07:00
Gravita
b09cd5c456 [FIX] New trigger system 2021-06-18 11:34:32 +07:00
Gravita
d01c27177c [FEATURE] isAllowSave support 2021-06-16 16:35:55 +07:00
Gravita
8ea134dc27 [FIX] AuthCoreProvider checkServer bug fixes 2021-06-15 21:02:33 +07:00
Gravita
9fe1fc4f23 [FEATURE] AuthCoreProvider features 2021-06-15 19:24:28 +07:00
Gravita
201b6826ed [FEATURE] PasswordVerifier encrypt support 2021-06-15 18:24:29 +07:00
Tenebrius
8c259a7702 [Fix] Хеширование 2021-06-14 14:22:08 +05:00
Tenebrius
781ab27127 [Fix] Хеширование 2021-06-14 13:59:53 +05:00
Gravita
00bbad3451 [FIX] RequestAuthProvider 2021-06-13 17:24:11 +07:00
Gravita
3431fae109 [FEATURE] 1.17 support 2021-06-11 10:14:22 +07:00
Gravita
32a4729970 [FIX] NPE in ClientLauncherEntryPoint 2021-06-09 10:01:07 +07:00
Gravita
8ad6f7ccbe [FIX] Jwts token builder 2021-06-06 00:50:47 +07:00
Gravita
fcdaa36421 [FIX] Jwts token builder 2021-06-06 00:46:39 +07:00
Gravita
5886d1ac48 [FEATURE] Downloader fix 2021-06-05 06:30:56 +07:00
Gravita
314eb8c09e [FEATURE] MySQLCoreProvider support HWID 2021-06-04 06:28:32 +07:00
Gravita
386239bfd7 [FEATURE] More commands 2021-06-04 01:13:12 +07:00
Gravita
c719f2448e [FEATURE] Updates cache 2021-06-01 05:48:33 +07:00
Gravita
20a326a707 [FIX] CheckServer fix 2021-05-31 08:25:33 +07:00
Gravita
a700ec4ca7 [FIX] encrypted runtime (ZipException: duplicate) 2021-05-29 05:23:29 +07:00
Gravita
5920f524c7 [FIX] Java Version search 2021-05-29 03:14:03 +07:00
Gravita
265a872b08 [FIX] Bug fixes 2021-05-28 21:24:06 +07:00
Gravita
73c6c48f42 [FEATURE] AuthSupportHardware 2021-05-28 21:06:14 +07:00
Gravita
568852b951 [FEATURE] AuthSocialProvider 2021-05-28 19:13:16 +07:00
Gravita
6c966b6126 [FIX] WebView auth 2021-05-28 04:40:37 +07:00
Gravita
c2f55998e3 [FIX] JsonCoreProvider 2021-05-25 21:44:25 +07:00
Gravita
5a349afe9d [FIX] JsonCoreProvider: update accessToken 2021-05-25 17:54:45 +07:00
Gravita
be78caa841 [FEATURE] JsonCoreProvider: getDetails 2021-05-25 17:49:22 +07:00
Gravita
fc33ed11d0 [FEATURE] JsonCoreProvider 2021-05-25 17:38:20 +07:00
Gravita
cd99641327 [REFACTOR] Idea Reformat Code 2021-05-25 16:17:29 +07:00
Gravita
2c41b510ad [FIX] Bug fixes 2021-05-23 21:46:52 +07:00
Gravita
b7a7156408 [FEATURE] AuthCoreProvider: OAuth Support Part 4 2021-05-23 18:14:57 +07:00
Gravita
ea3310b738 [FEATURE] AuthCoreProvider: OAuth Support Part 3 2021-05-23 17:17:56 +07:00
Gravita
d3751732b0 [FEATURE] AuthCoreProvider: OAuth Support Part 2 2021-05-23 03:22:04 +07:00
Gravita
b919020988 [FEATURE] AuthCoreProvider: OAuth Support Part 1 2021-05-23 02:46:31 +07:00
Gravita
c37fb47795 [FIX] AccessToken null 2021-05-21 17:48:29 +07:00
Gravita
e1f356feb7 [FEATURE] Default commands in AuthCoreProvider 2021-05-20 22:35:34 +07:00
Gravita
96ef860c70 [FIX] MySQLCoreProvider 2021-05-20 02:47:22 +07:00
Gravita
d9f8b20a71 [FEATURE] PasswordVerifier and MySQLCoreProvider 2021-05-20 02:27:47 +07:00
Gravita
b5ce3102a9 [FIX] Deprecated warning 2021-05-20 02:27:47 +07:00
Gravita
929a3a4ebb [FIX] GetAvailabilityAuthResponse 2021-05-20 02:27:47 +07:00
Gravita
6f6aa81554 [FEATURE] RejectAuthCoreProvider 2021-05-20 02:27:47 +07:00
Gravita
b647f49390 [FEATURE] New Core Auth System 2021-05-20 02:27:47 +07:00
Gravita
97faf5ef79 [FEATURE] Configure projectName and address from env 2021-05-20 02:27:47 +07:00
Gravita
30cabd25fd [FIX] Encrypted Runtime 2021-05-20 02:27:47 +07:00
Gravit
92a6947ab8
Update SaveProfilesCommand.java 2021-05-13 01:20:05 +07:00
Gravita
c2b499b2a9 [FEATURE] LogAppender 2021-05-10 15:53:18 +07:00
Gravita
7a1746281d [REFACTOR] Moving to log4j2 logger finally 2021-05-10 14:51:52 +07:00
Gravita
a4596b8c2f [REFACTOR] Moving to log4j2 logger 2021-05-10 14:34:27 +07:00
Gravita
7277aba7ee [FIX] makeProfile fix 2021-05-10 13:52:12 +07:00
Gravita
afe3dd543e [FEATURE] Support mittot/generate option in downloadClient 2021-05-07 20:19:02 +07:00
Gravita
21a203356f [FEATURE] Manual create ClientProfile 2021-05-07 19:25:04 +07:00
Gravita
d837658d36 [FIX] ComponentCommand 2021-05-04 20:28:26 +07:00
Gravita
5b5da76bff [FIX] Crash corrupted sessions.json 2021-05-04 19:39:10 +07:00
Gravita
ea7159dba6 [FEATURE] Print java version in version command 2021-05-04 19:26:00 +07:00
Gravita
f188378fd6 [FEATURE] Print launcher modules in modules command 2021-05-04 19:13:33 +07:00
Gravita
ae82964a24 [FIX] Duplicate profileUUID error 2021-05-04 18:08:13 +07:00
Gravita
8ab1dda430 [FIX] Double ProGuard task 2021-04-30 00:39:25 +07:00
Gravita
d522976f0b [FEATURE] Support icon in notifications 2021-04-30 00:20:10 +07:00
Gravita
68d7c0a947 [FEATURE] Support encrypted runtime 2021-04-26 22:21:28 +07:00
Gravita
2def9c20d9 [FIX] Support SPI in Launcher 2021-04-22 21:03:43 +07:00
Gravita
5d35c0823e [REFACTOR] Switch to log4j 2 2021-04-18 18:35:46 +07:00
Gravita
66db1eb861 [FEATURE] Arch/Debian openjfx search 2021-04-18 18:03:47 +07:00
Gravita
92e2a6c86d [FIX] NPE в clients 2021-04-15 21:02:46 +07:00
Gravita
5bbe63f78c [FIX] Bug fixes 2021-04-14 17:22:07 +07:00
Gravita
7886cce6f8 [FEATURE] Support 2FA in JsonAuthProvider 2021-04-13 21:27:37 +07:00
Gravita
d1e671a935 [FEATURE] AuthDetails support 2021-04-13 19:39:02 +07:00
Gravita
40e4949c47 [FEATURE] Use tmpdir for build 2021-04-13 18:23:39 +07:00
Gravita
5547909c16 [FEATURE][EXPERIMENTAL] LogHelper slf4j bridge 2021-04-13 18:04:00 +07:00
Gravita
3b6997a723 [FEATURE][EXPERIMENTAL] Log4j logging 2021-04-13 16:49:11 +07:00
Gravita
e5e8fa1463 [FIX] ProGuard pipeline fix 2021-04-07 15:48:21 +07:00
Gravita
7015d45088 [FEATURE] AuthRSAPassword AuthAESPassword 2021-04-07 15:20:09 +07:00
Gravita
e9b14c921c [FEATURE] KeyAgreementManager 2021-04-07 14:00:30 +07:00
Gravita
6c37dd6ed2 [FEATURE] Version comparing 2021-04-06 22:36:43 +07:00
Gravita
f1331b6d5d [REFACTOR] Mini refactoring 2021-04-06 17:39:14 +07:00
Gravita
1cb2369bfa [FIX] Bug fixes 2021-04-01 00:24:36 +07:00
Gravita
edbed3db1d [FIX] Remove default .crt file 2021-03-30 21:44:19 +07:00
Gravita
dc51ca1c9c [FEATURE] PrepareMode 2021-03-30 16:13:41 +07:00
Gravita
f8af81b141 [FIX] Compile fix 2021-03-27 17:35:12 +07:00
Gravita
fc13442c89 [FEATURE] Updates and profiles sync in new thread 2021-03-27 17:22:46 +07:00
Gravita
63891cd743 [FEATURE] ProGuard Component 2021-03-27 17:22:46 +07:00
Gravita
1452b59fa5 [FIX] Params Parsing 2021-03-27 17:22:46 +07:00
Gravita
afc84ebae8 [FEATURE] RemoteControlModule 2021-03-27 17:22:46 +07:00
Gravita
cd5c78c413 [ANY] 5.2.0 dev 2021-03-27 17:22:46 +07:00
Gravita
0b1f3f66af [REFACTOR] IDEA Code Reformat 2021-03-27 17:22:46 +07:00
Gravita
fb3241dd52 [REFACTOR] IDEA Clean 2021-03-27 17:22:46 +07:00