engineering
/
cloudservices
3
0
Fork 1
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity
1,080 Commits
2 Branches
0 Tags
3.1 MiB
Commit Graph

993 Commits (48e5579a8c11ca221fbe7430c27f0150df244ad6)

Author SHA1 Message Date
Bsian 7b3963dc54
Use golang parseCertificate 2020-01-01 21:45:46 +00:00
Bsian d5be7f6e0f
Set CWD 2020-01-01 21:39:55 +00:00
Bsian 41f42c2f9d
same as prev 2020-01-01 21:37:20 +00:00
Bsian e9430a85e6
made it so much less clusterfuck 2020-01-01 21:35:42 +00:00
Matthew a2213ae014
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices 2020-01-01 15:56:56 -05:00
Matthew ae971f9f32
optional args to Util.exec 2020-01-01 15:55:43 -05:00
Bsian 4910ba62db
remove 0 values 2020-01-01 16:13:51 +00:00
Bsian b77a0491af
ugh 2020-01-01 15:40:28 +00:00
Bsian bde6439c25
Seeing if this does anything 2020-01-01 15:39:09 +00:00
Bsian adad62cf96
idk anymore 2020-01-01 15:32:33 +00:00
Bsian b2196186be
Revert "Fix cert pathing" 
This reverts commit 2a60c7dcf2.
 2020-01-01 15:27:42 +00:00
Bsian 5bb02c85f0
Should fix certificate status not showing 2020-01-01 15:10:12 +00:00
Bsian e21140ce58
Fix array errors if null 2020-01-01 13:19:31 +00:00
Bsian 2a60c7dcf2
Fix cert pathing 2020-01-01 13:07:47 +00:00
Bsian 817ac0aa97
Check if cert and private key match 2020-01-01 12:50:52 +00:00
Bsian da29adac49
Improvements 2020-01-01 03:28:57 +00:00
Matthew a9cd35b21a
add coal to eval & exec user array 2019-12-30 18:14:09 -05:00
Matthew 2e88d68301
add cert/priv key signature checker 2019-12-30 17:59:07 -05:00
Matthew d464d3fa1c
set env variables for Util.exec 2019-12-30 17:58:39 -05:00
Bsian 5b600571f6
Update perms 2019-12-30 17:03:17 +00:00
Bsian a14e4eb6cf
And typo 2019-12-30 17:00:48 +00:00
Bsian fe31d925a3
Fix markdown 2019-12-30 16:59:22 +00:00
Bsian 591ced7c06
Trim newlines 2019-12-30 16:57:34 +00:00
Bsian 6cbedfa04b
include subcommands in cache removal 2019-12-30 16:47:14 +00:00
Bsian 0a2088977b
Added subcommand 2019-12-30 16:40:23 +00:00
Bsian f2d250921f
Get rid of the damn comments 2019-12-28 03:33:14 +00:00
Bsian 9a47286889
Merge branch 'master' of https://gitlab.libraryofcode.org/engineering/cloudservices 2019-12-28 03:12:22 +00:00
Bsian 2b227d49f4
Add subcommand 2019-12-28 03:12:14 +00:00
Matthew 7a42292f40
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices 2019-12-27 21:56:07 -05:00
Matthew f229e4a825
add parseCertificate typescript bindings 2019-12-27 21:55:21 -05:00
Matthew f866592513
add lock on storage 2019-12-27 21:19:32 -05:00
john doe 4cdc217b6e Update modlogs.ts 2019-12-27 15:24:54 -05:00
john doe 4bd924bae4 Update help.ts 2019-12-27 15:24:15 -05:00
john doe 326757130b Update cwg_data.ts 2019-12-27 15:23:40 -05:00
Matthew 13faf9b4f9
comma in homepath type in AccountInterface 2019-12-27 14:08:04 -05:00
Matthew f6779f90ce
remove groupdel 2019-12-27 14:07:51 -05:00
Matthew 9400caaea9
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices 2019-12-27 14:00:38 -05:00
Matthew dae9750d08
dir changes 2019-12-27 14:00:30 -05:00
Matthew 6a9d31f1a9
place go files in project dirs and updates to checkCertificate 2019-12-27 13:59:58 -05:00
Matthew a1176bfa36
removing group isnt required as deluser performs the operation 2019-12-27 13:59:28 -05:00
Bsian ff20f08d8a
Fix typo 2019-12-25 02:18:01 +00:00
Bsian 7c12ca9192
Fixes 2019-12-25 01:59:03 +00:00
Bsian e040f117a3
Diagnose bug 2019-12-25 01:40:48 +00:00
Bsian dcfb5472cc
Perms stuff 2019-12-23 23:28:48 +00:00
Bsian 630a9cbca8
Correct role permissions 2019-12-23 23:19:33 +00:00
Bsian 9e0ead2520
Failsafe i guess 2019-12-23 23:15:39 +00:00
Bsian 692b4af059
Added password reset command 2019-12-23 23:10:04 +00:00
Bsian 1fba4a3f06
Stop un initing 2019-12-23 18:14:42 +00:00
Bsian bc4e351a0a
Mongoose is a useless pile of shit, bye bye db reloader 2019-12-23 17:43:42 +00:00
Bsian 72b89b2f78
Added DB to reload 2019-12-23 17:15:24 +00:00
Bsian 612d527986
Add home path 2019-12-23 17:08:42 +00:00
Bsian 82b3148fd3
Move group delete to after folder delete 2019-12-23 16:55:10 +00:00
Bsian bbaf9f55db
Stop erroring if user isn't in server 2019-12-23 16:11:45 +00:00
Bsian 11ac39dc19
Stop erroring if user isn't in server 2019-12-23 15:24:46 +00:00
Bsian d445108a98
Promise rejections 2019-12-23 14:42:24 +00:00
Bsian 07a241ebe3
Removed unnecessary usage 2019-12-23 14:18:17 +00:00
Matthew c0ea781511
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices 2019-12-22 16:49:44 -05:00
Matthew b964d4f8d8
add checkCertificate go 2019-12-22 16:49:21 -05:00
Bsian f547c321ae
Delete group on account deletion 2019-12-21 18:30:52 +00:00
Matthew 1452ae0c9e
change to ms 2019-12-20 15:53:59 -05:00
Matthew f4ab9e9cb8
change spawn path 2019-12-20 12:54:35 -05:00
Matthew c707a05f35
change spawn path 2019-12-20 12:50:19 -05:00
Matthew 4ded030af6
change spawn path 2019-12-20 12:46:24 -05:00
Matthew 684c6b8d92
change spawn path 2019-12-20 12:32:00 -05:00
Matthew 9b7b5ee03d
change spawn path 2019-12-20 12:29:28 -05:00
Matthew efc17189c0
move go files to another directory 2019-12-20 12:25:35 -05:00
Matthew ace7594c12
should be spawn instead of execFile 2019-12-20 12:18:19 -05:00
Matthew de6ed2d37f
logs 2019-12-19 00:02:59 -05:00
Matthew 338f880bd4
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices 2019-12-18 23:47:13 -05:00
Matthew 31191b01c6
make storage.ts run go 2019-12-18 23:47:08 -05:00
Matthew 963993d520
dirsize and storage go files 2019-12-18 23:47:00 -05:00
Bsian 23d82e0f3a
Hopefully fix false positive 2019-12-18 23:26:42 +00:00
Bsian f96808e6d6
Fix failing to find commands 2019-12-18 23:03:46 +00:00
Bsian 6f20ecf178
test 2019-12-17 01:55:52 +00:00
Bsian b18cbfe7c3
test 2019-12-17 01:53:56 +00:00
Bsian a25274e51a
test 2019-12-17 01:50:20 +00:00
Bsian 66ef185819
test 2019-12-17 01:46:17 +00:00
Bsian ccb39a910c
test and fix 2019-12-17 01:41:31 +00:00
Bsian d793731bc9
Fix stuff, test 2019-12-17 01:35:16 +00:00
Bsian c3edc68a84
Alias only show parent command name if subcommand 2019-12-17 01:33:42 +00:00
Bsian 08effc5b53
Attempt 2 2019-12-17 01:27:12 +00:00
Bsian 532dbcc320
Message update 2019-12-17 00:04:39 +00:00
Matthew cb097067b5
fix for disk blocking 2019-12-13 19:23:48 -05:00
Matthew 0838022eae
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices 2019-12-11 22:21:11 -05:00
Matthew 0dcb367cc8
fixes an issue with account name in cacc being set to command invoker 2019-12-11 22:20:43 -05:00
Bsian 1d3e6ce811
Eris update 2019-12-09 10:07:59 +00:00
Bsian ba71d2ebdf
Fixed stuff for subcommands 2019-12-03 23:26:10 +00:00
Bsian 6796317c6c
this shit doesn't work 2019-12-01 01:50:47 +00:00
Bsian 00343fe7f3
testing 2019-12-01 01:35:15 +00:00
Bsian d9cc8ac1ec
stay in same format 2019-12-01 01:32:26 +00:00
Bsian 85a60c00e7
Fixed errors throwing starting prefix 2019-12-01 01:29:24 +00:00
Bsian 98c3b22f66
Fix util reloading 2019-12-01 00:44:36 +00:00
Bsian 1473aaec11
reverting for util, fixing for command 2019-12-01 00:38:01 +00:00
Bsian d481d7c90c
Fix util reloading 2019-12-01 00:25:47 +00:00
Bsian c11a7e62c3
Reverting and fixing command reloader 2019-12-01 00:22:51 +00:00
Bsian f7822fa2cb
Fix util reloading 2019-12-01 00:17:44 +00:00
Bsian 429a5fda8e
Fix args lowercase 2019-12-01 00:10:49 +00:00
Bsian af1827337f
Fix no args 2019-11-30 23:59:13 +00:00
Bsian 495159336b
Don't restart if build error 2019-11-30 23:55:49 +00:00
Bsian 7bc601b685
Perms fix 2019-11-30 23:53:23 +00:00
Bsian ceb613c95f
Added reload command 2019-11-30 23:47:47 +00:00
Bsian a7966d7adb
Added build error 2019-11-30 23:14:50 +00:00
Bsian d52e698fde
Memory saving 2019-11-30 23:00:11 +00:00
Bsian f806afa1da
Memory saving 2019-11-30 22:55:53 +00:00
Bsian a718bf23b3
rewrite command resolver 2019-11-30 22:09:24 +00:00
Bsian a283542048
What the fuck is wrong with returning? Aint no need for another unnecessary line 2019-11-26 08:24:24 +00:00
Matthew 24db3a2513
msg editing 2019-11-25 21:06:01 -05:00
Matthew d2c10b45ad
update shell 2019-11-25 18:25:04 -05:00
Matthew 3a99c9efa4
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices 2019-11-21 21:22:25 -05:00
Matthew 84a22a6a76
rm comments and change archtypes 2019-11-21 21:22:07 -05:00
Bsian 5a3520aa4b
Error handler 2019-11-21 14:42:05 +00:00
Bsian 3156fe58e9
Error handling 2019-11-21 14:39:07 +00:00
Bsian 7316b62282
Added command 2019-11-21 14:35:21 +00:00
Matthew b623654412
rename me command and add optional user lookup 2019-11-19 18:57:15 -05:00
Matthew 5cc441115e
register subcommand 2019-11-19 18:28:21 -05:00
Matthew e934d6d398
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices 2019-11-19 18:27:05 -05:00
Matthew 7322c014c9
add maintenance boolean 2019-11-19 18:26:59 -05:00
Matthew a7012e31aa
why r u awaiting a constructor 2019-11-19 18:26:13 -05:00
Matthew fe1e48cdb0
Add whois_me command 2019-11-19 18:25:57 -05:00
Bsian 7d212bde3f
I don't like extra spaces 2019-11-19 20:34:24 +00:00
Bsian f97b43426b
title not showing subcommand 2019-11-19 20:30:08 +00:00
Bsian e550c68fbe
Let's try this method 2019-11-19 20:26:08 +00:00
Bsian bb179d2854
I think this adds the subcommand properly to the subcommand list 2019-11-19 20:20:33 +00:00
Bsian 6651e3cc86
Stop erroring in DMs 2019-11-19 15:57:28 +00:00
Bsian 6106fb067c
Fix markdown 2019-11-19 15:53:55 +00:00
Bsian 28f8ec58ec
Include the damn fuckin file 2019-11-19 15:47:37 +00:00
Bsian af136b1b6e
Added createcrt command 2019-11-19 15:45:22 +00:00
Bsian 2152c988bf
Use new hash getter to authenticate 2019-11-19 14:06:44 +00:00
Bsian a7415ce381
Use securesign cli hash 2019-11-19 14:00:50 +00:00
Bsian 405d9345dd
Matt fuckin look at the errors 2019-11-19 13:41:07 +00:00
Bsian b04cfbd0a6
Don't restart when updating 2019-11-19 13:32:33 +00:00
Bsian d5fb18b73b
Change 1 for auth update 2019-11-19 13:26:15 +00:00
Matthew 1e8512e9f5
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices 2019-11-18 20:52:20 -05:00
Matthew ade9525cf9
typings for route in Server.ts 2019-11-18 20:52:12 -05:00
Matthew 0150affaf5
change .us domains to .org in cacc command 2019-11-18 17:33:45 -05:00
Bsian 06265b653e
Don't error if user doesn't have account 2019-11-18 20:42:18 +00:00
Bsian 0fbd44c463
Registered the command 2019-11-18 20:33:47 +00:00
Bsian 99ea3da196
Forgot to include this 2019-11-18 20:21:06 +00:00
Bsian 701eb132cb
Added restart command 2019-11-18 20:14:43 +00:00
Bsian 0dbb6c698c
Merge branch 'master' of https://gitlab.libraryofcode.us/engineering/cloudservices-rewrite 2019-11-18 09:45:51 +00:00
Matthew 6f9569b38a
fix spacing in cwg_create 2019-11-17 20:53:01 -05:00
Matthew 254f489909
some jsdoc in Route class 2019-11-17 20:52:54 -05:00
Matthew 0b25a67575
change Map to Collection in server routes 2019-11-17 20:52:41 -05:00
Matthew 7e8256a474
remove redudant await and remove logging 2019-11-17 20:44:26 -05:00
Matthew 2b2b4f6830
string should be a number 2019-11-17 18:13:17 -05:00
Matthew 51839c20eb
fix typo 2019-11-17 18:13:09 -05:00
Matthew 1f2791db45
FS route 2019-11-17 18:02:54 -05:00
Matthew 95f78b3643
add storage information route 2019-11-17 18:02:48 -05:00
Matthew 7e2339cbc8
add maintenance binding routes 2019-11-17 18:02:40 -05:00
Matthew cc1b9a2342
fix routing issue 2019-11-17 16:26:07 -05:00
Matthew 09eb30d813
fix csp again 2019-11-17 16:23:24 -05:00
Matthew d219a1eb7e
fix issue with CSP 2019-11-17 16:20:56 -05:00
Matthew a45f1b6692
New Root endpoint 2019-11-17 16:12:00 -05:00
Matthew 42ed3da0d3
Error Handling & Minification 2019-11-17 16:11:41 -05:00
Bsian d399811cbb
Error handler 2019-11-17 11:07:01 +00:00
Matthew 69a7af127b
update index 2019-11-17 00:51:09 -05:00
Matthew deac75184b
l 2019-11-17 00:50:01 -05:00
Matthew eab054c12a
add bearer token command 2019-11-17 00:43:58 -05:00
Matthew 466babfe74
optional moderation id 2019-11-17 00:28:14 -05:00
Matthew d10156e2c1
remove debugs 2019-11-17 00:24:14 -05:00
Matthew 8d43d4c6c5
checks 2019-11-17 00:19:38 -05:00
Matthew 8e613a9425
change checks 2019-11-17 00:03:44 -05:00
Matthew a08babb0de
check 2019-11-17 00:00:24 -05:00
Matthew 988539279b
account changes 2019-11-16 23:58:11 -05:00
Matthew 1927e3b295
auth tags 2019-11-16 23:57:17 -05:00
Matthew 6fba087b2d
fix cipher issues 2019-11-16 23:40:32 -05:00
Matthew e44da74a0f
check 2019-11-16 23:29:36 -05:00
Matthew 747a9a7ae5
await 2019-11-16 23:26:34 -05:00
Matthew e18307cb7f
add new fields 2019-11-16 23:24:36 -05:00
Matthew b0cf9bfc1e
add salt 2019-11-16 23:22:49 -05:00
Matthew 009bdad83e
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices-rewrite 2019-11-16 22:55:49 -05:00
Matthew aa6af03930
remove unused imports 2019-11-16 22:55:45 -05:00
Matthew 466fc8bf1d
add new code constant in route 2019-11-16 22:55:38 -05:00
Matthew b0fe33f98a
Change Bearer methods (verify to encrypt) 2019-11-16 22:55:25 -05:00
Bsian 1a0162734d
Got rid of embed import 2019-11-17 02:57:59 +00:00
Bsian 48468754c5
Added activatekey subcommand 2019-11-17 02:57:33 +00:00
Bsian 8cf1157442
Fix? 2019-11-17 01:53:38 +00:00
Bsian a0f990105d
Merge branch 'master' of https://gitlab.libraryofcode.us/engineering/cloudservices-rewrite 2019-11-17 01:49:43 +00:00
Matthew ba214c5335
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices-rewrite 2019-11-16 20:48:48 -05:00
Matthew b9101de1cc
Fix encoding issue 2019-11-16 20:48:40 -05:00
Bsian 31b9c69728
SecureSign hash error handler 2019-11-17 01:46:55 +00:00
Bsian 3ec1e03e27
Perm fix 2019-11-17 01:42:47 +00:00
Matthew 020d530451
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices-rewrite 2019-11-16 20:38:20 -05:00
Matthew 72d8805854
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices-rewrite 2019-11-16 20:38:09 -05:00
Bsian b3370954b6
Registered subcommand 2019-11-17 01:38:05 +00:00
Matthew 9023ed1112
update security checking 2019-11-16 20:38:03 -05:00
Bsian 8c35748aee
Added and changed stuff 2019-11-17 01:35:50 +00:00
Matthew 6f0741b03b
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices-rewrite 2019-11-16 20:33:43 -05:00
Matthew 95a217e3c3
Fix keypairs 2019-11-16 20:33:29 -05:00
Bsian c6267a455d
Fixing something else 2019-11-17 01:14:50 +00:00
Bsian 6fdf77555a
Merge branch 'master' of https://gitlab.libraryofcode.us/engineering/cloudservices-rewrite 2019-11-17 01:14:11 +00:00
Bsian 942754f64a
Fixing smth 2019-11-17 01:13:59 +00:00
Matthew 35519fd948
Fix issue with auth 2019-11-16 20:13:35 -05:00
Matthew cc0416c67e
change loading 2019-11-16 20:04:00 -05:00
Matthew ceb2e54e99
. 2019-11-16 19:55:00 -05:00
Matthew 428898f085
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices-rewrite 2019-11-16 19:51:38 -05:00
Matthew cb26af0252
Fix module loading 2019-11-16 19:51:29 -05:00
Bsian dde33ce76b
Merge branch 'master' of https://gitlab.libraryofcode.us/engineering/cloudservices-rewrite 2019-11-17 00:45:59 +00:00
Bsian 2dc19179a7
config 2019-11-17 00:45:43 +00:00
Matthew 820bf7b081
Fix module loading issue 2019-11-16 19:45:39 -05:00
Matthew 242ade0fbb
Commit server.ts 2019-11-16 19:43:21 -05:00
Matthew 2ab5d40c55
add logging to Server.loadRoutes() 2019-11-16 19:38:59 -05:00
Matthew e24bca245e
add acc info GET 2019-11-16 19:37:45 -05:00
Matthew 1ec893b0fa
update class index 2019-11-16 19:26:39 -05:00
Matthew 8345ec0733
add Account route 2019-11-16 19:25:44 -05:00
Matthew 5a0d4cdcaa
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices-rewrite 2019-11-16 19:24:54 -05:00
Matthew a846d2a831
add Route extender class 2019-11-16 19:24:43 -05:00
Matthew e42761dcda
add security api class 2019-11-16 19:24:32 -05:00
Matthew ed9d095e78
Add express server class 2019-11-16 19:24:24 -05:00
Matthew ea1f20afc6
Add bearer signatures to acc model 2019-11-16 19:24:08 -05:00
Matthew 76a1ccba1c
Bind server to client 2019-11-16 19:23:50 -05:00
Bsian af0db23af3
Prep for SecureSign CLI integration 2019-11-16 23:43:05 +00:00
Bsian 44ddfa0511
Better wording 2019-11-16 23:11:55 +00:00
Bsian a0dbbbe15b
Fix the flipping endswith 2019-11-16 22:53:35 +00:00
Bsian 5657e6bc14
More info added to error 2019-11-16 22:50:58 +00:00
Bsian 61bfb1e2ec
Account check fix 2019-11-16 22:46:38 +00:00
Bsian f946b1c8bf
Fixes 2019-11-16 22:39:34 +00:00
Bsian 802d18541f
Added commands (not complete) 2019-11-16 22:27:51 +00:00
Bsian 6c769682f9
Made eval and exec not guild only 2019-11-16 19:42:34 +00:00
Bsian 97152cd063
Merge branch 'master' of https://gitlab.libraryofcode.us/engineering/cloudservices-rewrite 2019-11-16 19:29:20 +00:00
Matthew 17572da752
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices-rewrite 2019-11-16 14:19:47 -05:00
Matthew 6fac48e996
Return types in funcs 2019-11-16 14:19:24 -05:00
Bsian 1d603c12f4
Got rid of comments 2019-11-16 15:09:41 +00:00
Bsian 259c5d15c8
Workaround for embed limits 2019-11-14 23:13:52 +00:00
Bsian 43943fce5d
Register command 2019-11-14 22:12:12 +00:00
Bsian 56d1ce3e30
added command 2019-11-14 21:56:58 +00:00
Bsian b1c261cb57
Merge branches 'master' and 'master' of https://gitlab.libraryofcode.us/engineering/cloudservices-rewrite 2019-11-14 21:02:30 +00:00
Matthew 7c4ca745ac
error handling for ENOENT in parse 2019-11-11 21:00:41 -05:00
Matthew ba3fd31c8e
update archetypes 2019-11-11 20:52:42 -05:00
Matthew 9412ee87c9
permission changes 2019-11-11 20:15:46 -05:00
Matthew 3964c77a40
memory is wrong, fix 2019-11-10 00:03:35 -05:00
Matthew 564623bc53
factor 2019-11-09 23:50:28 -05:00
Matthew 6af603b96b
factor 2019-11-09 23:46:21 -05:00
Matthew adf1240116
fix int issue 2019-11-09 23:38:11 -05:00
Matthew a62d10caa5
run every 15 minutes 2019-11-09 23:34:48 -05:00
Matthew 166ba54c4b
change to 0 KB if bytes == 0 2019-11-09 23:34:36 -05:00
Matthew 0c55303505
fix await issue in whois 2019-11-09 23:34:19 -05:00
Matthew e40d8fe47f
fix issue with storage 2019-11-09 23:23:26 -05:00
Matthew b924e08ced
change mark issues 2019-11-09 23:16:04 -05:00
Matthew 990cb8be23
change mark issues 2019-11-09 23:14:14 -05:00
Matthew d7a19e1b4e
move bindings 2019-11-09 23:14:02 -05:00
Matthew cbeb964b21
change interval timing on storage 2019-11-09 23:13:49 -05:00
Matthew 615cc76904
Add storage interval 2019-11-09 23:05:34 -05:00
Matthew b6f37d072c
add cpu usage, memory, and storage to whois 2019-11-09 23:05:17 -05:00
Matthew 8a23d7dbe4
bind intervals on startup and add redis 2019-11-09 23:05:01 -05:00
Matthew 8959dd5315
send dm to log and user on delete cwg 2019-11-08 20:05:47 -05:00
Matthew d583cd969e
conflict 2019-11-08 20:03:01 -05:00
Bsian 8b47fba0ba
Sort by date 2019-11-02 16:17:55 +00:00
Bsian af6ba645f8
use result path 2019-11-02 13:28:20 +00:00
Bsian 8e59238c5d
Fixed result 2019-11-02 13:26:45 +00:00
Bsian e9110c3180
show help info 2019-11-02 13:24:04 +00:00
Bsian e7bab80282
k 2019-11-02 13:22:49 +00:00
Bsian 1a59bdcc77
last try 2019-11-02 00:55:46 +00:00
Bsian 16cfd9062e
Fix? 2019-11-02 00:53:34 +00:00
Bsian 41914db777
Fix? 2019-11-02 00:41:15 +00:00
Bsian c7e036062f
Hopefully stop memory leak 2019-11-02 00:32:58 +00:00
Bsian 9b85bea477
k 2019-11-02 00:19:09 +00:00
Bsian ad1b70888e
k 2019-11-02 00:15:22 +00:00
Bsian 1d687f6d69
k 2019-11-02 00:09:25 +00:00
Bsian a2d267465c
Diagnosis 2019-11-02 00:06:14 +00:00
Bsian 7c6d9e23cf
Attempted fix at embed not showing 2019-11-02 00:02:16 +00:00
Bsian a5cf30652c
Support multiple domains using a single port 2019-11-01 23:53:21 +00:00
Bsian 2c528c36c9
Allowed multiple domains to use the same port 2019-11-01 23:26:19 +00:00
Bsian d918cd30bd
included extra stuff 2019-11-01 23:15:39 +00:00
Bsian 0c4902fb61
Added disk command 2019-11-01 22:27:15 +00:00
Matthew 014a53890d
rm check for ports 2019-11-01 17:46:23 -04:00
Bsian bf7d86d5a5
Fixed subcommand text 2019-11-01 16:04:24 +00:00
Bsian 4e04e20f9f
Fixed subcommand list 2019-11-01 15:13:21 +00:00
Bsian 98cfa9f49e
Stop failing to load command 2019-11-01 15:07:21 +00:00
Bsian da2435fbcc
Implement Array#map 2019-11-01 15:00:25 +00:00
Bsian db7785c749
Changed usage 2019-11-01 15:00:00 +00:00
Bsian 6e39a27dc5
Hopefully fix second+ subcommand aliases not working 2019-11-01 12:11:25 +00:00
Bsian 01e0cafb6e
Remove role on account delete 2019-11-01 10:51:45 +00:00
Matthew cd123f38a5
fix html 2019-10-31 23:59:43 -04:00
Matthew ef3919ce92
add additional typings to collection 2019-10-31 20:38:19 -04:00
Matthew 633f380cb8
deleteaccount should remove verified role 2019-10-31 20:37:53 -04:00
Bsian 697111cb1d
Fix parent label subcommand names not resolving 2019-11-01 00:24:08 +00:00
Bsian 694461a303
Fix command name for subcommands 2019-11-01 00:22:11 +00:00
Bsian bb81cf6842
Last attempt 2019-11-01 00:20:55 +00:00
Bsian 5076b7deef
Attempted fix at help 2019-11-01 00:17:57 +00:00
Bsian f92245b843
I was not meant to slice 2019-10-31 23:57:18 +00:00
Bsian 8d8156d22a
Hopefully fix subcommand name issue in help 2019-10-31 23:54:25 +00:00
Bsian 7e32cb50e2
Fixed help loader 2019-10-31 23:47:36 +00:00
Bsian 7cf6adfff5
Fixed args resolve command 2019-10-31 23:39:17 +00:00
Bsian bacfef6770
Fix leak 2019-10-31 23:38:42 +00:00
Bsian 38eb31dce9
Diagnosis 2019-10-31 23:32:58 +00:00
Bsian 358604ec48
Attempted fix at leak 2019-10-31 23:29:51 +00:00
Bsian c78f58bf5a
Changed CWG command to subcommand format 2019-10-31 23:17:34 +00:00
Bsian 62cb43829b
Updated error handler for subcommands 2019-10-31 23:00:14 +00:00
Bsian f8a600535b
Use new system for loading commands 2019-10-31 22:23:59 +00:00
Bsian ab7008b429
New subcommand support 2019-10-31 22:14:34 +00:00
Bsian 29c7b0a5f9
Stop base command from registering 2019-10-31 20:32:12 +00:00
Bsian d01624fc11
More edits 2019-10-31 20:26:01 +00:00
Bsian e8441563f3
More updates 2019-10-31 20:12:08 +00:00
Bsian e8782c24ea
Removed unused import 2019-10-31 20:11:56 +00:00
Bsian 01232279ac
Actually included the file 2019-10-31 20:11:20 +00:00
Bsian 71053df288
Added in-house Collection 2019-10-31 18:32:59 +00:00
Bsian 28229f6e69
Added user for notification, in cloud logs only 2019-10-31 10:44:39 +00:00
Matthew e55eeb8dc7
delete inv cmd 2019-10-30 22:13:10 -04:00
Matthew 25c8611b4d
rm 2019-10-30 22:12:08 -04:00
Matthew 62557efecf
add notify command 2019-10-30 22:10:20 -04:00
Matthew f6f2105776
fix usage typos 2019-10-30 22:10:06 -04:00
Matthew afabcad8c1
fix typing errors 2019-10-30 21:32:37 -04:00
Matthew 9f8112fd20
Add ack for support 2019-10-30 21:32:30 -04:00
Matthew a4e9693292
matthew u shouldnt copy/paste 2019-10-30 21:29:08 -04:00
Matthew 74bdfacee1
fix constructor 2019-10-30 21:28:07 -04:00
Matthew 115b26d17a
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices-rewrite 2019-10-30 21:26:22 -04:00
Matthew fd4cd6a9b3
fix richembed set thumbnail func 2019-10-30 21:26:17 -04:00
Matthew 2674a955b0
dacc fixes 2019-10-30 21:26:06 -04:00
Matthew 51ec32085b
add whois command 2019-10-30 21:25:52 -04:00
Matthew dc9e728d1b
add warn command 2019-10-30 21:25:42 -04:00
Matthew af9e10e18e
add varying arch types in mod logs 2019-10-30 20:57:10 -04:00
Matthew c3ebd3510c
remove unneeded comments in lock 2019-10-30 20:56:57 -04:00
Matthew 64725c9282
fix typo and remove unneeded comments 2019-10-30 20:56:27 -04:00
Matthew a3bd122d2e
add warn command 2019-10-30 20:49:34 -04:00
Matthew ed35d6bc85
remove unused imports in lock 2019-10-30 20:49:27 -04:00
Matthew 40872f00e3
return the interface in util cacc 2019-10-30 20:49:15 -04:00
Bsian 094a59d45d
Updated link 2019-10-30 22:04:03 +00:00
Bsian 6489a176c5
Third time lucky 2019-10-30 20:43:33 +00:00
Bsian 297218abdf
Fix newline 2019-10-30 20:42:03 +00:00
Bsian b9730d9bf7
Actually fix the security vuln 2019-10-30 20:40:57 +00:00
Bsian c95ecd3aa3
security patch 2019-10-30 20:38:11 +00:00
Bsian b6ccfaa8a6
Merge branch 'master' of https://gitlab.libraryofcode.us/engineering/cloudservices-rewrite 2019-10-30 20:24:44 +00:00
Bsian 83a5df31b9
Added console output 2019-10-30 20:24:24 +00:00
Matthew 613c709e52
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices-rewrite 2019-10-30 16:23:43 -04:00
Matthew 45ec2d7af1
add punc 2019-10-30 16:23:37 -04:00
Bsian 869867e2c7
Fixed order 2019-10-30 20:19:13 +00:00
Bsian cf0bb51c1f
Fixed some stuff 2019-10-30 20:15:56 +00:00
Matthew 43b787abc0
fix type issue in cwg 2019-10-30 16:11:06 -04:00
Bsian 0e76ca890c
Fixed a few stuff 2019-10-30 18:35:30 +00:00
Bsian 8ab49fda0b
Updated index 2019-10-30 18:21:48 +00:00
Bsian 7174fb248e
Lint 2019-10-30 17:35:29 +00:00
Bsian acf6db96da
Actually reject 2019-10-30 17:34:02 +00:00
Bsian 4b51c2c06e
Lint 2019-10-30 17:19:44 +00:00
Bsian 4defc574a8
Show stderr or stdout if command fails 2019-10-30 17:16:28 +00:00
Matthew b7307ff2da Update src/commands/cwg.ts 2019-10-30 12:11:56 -04:00
Matthew b794f482f3 Update src/commands/cwg.ts 2019-10-30 11:56:38 -04:00
Matthew 80c8328e87 Update src/commands/cwg.ts 2019-10-30 11:53:18 -04:00
Matthew 0c9160a196 Update src/commands/cwg.ts 2019-10-30 11:51:48 -04:00
Matthew 0683424862 Update cwg.ts 2019-10-30 11:46:47 -04:00
Bsian 15575e600e
Added pull command, testing only 2019-10-30 12:53:36 +00:00
Bsian b4a64fde62
Stop erroring 2019-10-30 12:34:57 +00:00
Bsian ff298b690a
Markdown fix 2019-10-30 12:32:40 +00:00
Bsian 4069978ca4
Reordered error messages 2019-10-30 12:31:18 +00:00
Matthew 5dd6204866
add parse command 2019-10-30 00:06:46 -04:00
Matthew 79ca0d82ce
fix markdown; thanks null 2019-10-29 23:25:04 -04:00
Matthew c19092c895
add parse command 2019-10-29 23:22:41 -04:00
Matthew 786a14d126
rm on failure 2019-10-29 20:27:36 -04:00
Matthew d1d324ceb0 Revert "Added support for subcommands" 
This reverts commit 3f001eebd5
 2019-10-29 20:25:27 -04:00
Matthew 34dc8553f1
fix markdown issue in cwg 2019-10-29 20:20:00 -04:00
Matthew 764337852f
add new includes 2019-10-29 20:17:55 -04:00
Matthew 506e080394
if is cloud domain, delete dns record 2019-10-29 19:37:27 -04:00
Matthew 20337f7215
if is cloud domain, delete dns record 2019-10-29 19:32:04 -04:00
Matthew 8fbb4f1a16
Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices-rewrite 2019-10-29 19:13:13 -04:00
Matthew a017bf6a2e
Add delete subcommand on CWG 2019-10-29 19:12:36 -04:00
Bsian 3f001eebd5
Added support for subcommands 2019-10-29 21:44:12 +00:00
Bsian e7437d4b59
Fixed exec failure 2019-10-29 20:16:08 +00:00
Bsian f0385ce177
Stop creating another message 2019-10-29 20:14:02 +00:00
Bsian 9eca427ce9
Prepare for subcommand 2019-10-29 20:12:01 +00:00
Matthew 29b061eaa6
perms 2019-10-29 16:01:21 -04:00
Bsian 988ca6a2f7
Uncommented success message 2019-10-29 19:51:52 +00:00
Bsian bac8ed4c7c
Fixed CPU leak 2019-10-29 19:43:53 +00:00
Bsian 08bd4645f6
All moderation inserts use util 2019-10-29 18:20:51 +00:00
Bsian 8db1f65691
Fix invalid date showing 2019-10-29 17:43:26 +00:00
Bsian c9fed63480
Switched type parser to switch 2019-10-29 17:35:41 +00:00
Bsian 3ac6b28e38
Diagnosing issue 2019-10-29 17:29:14 +00:00
Bsian b5e143a31c
Don't try and specify time if not locking 2019-10-29 17:22:06 +00:00
Bsian 72764f7e14
Promise rejection wording change 2019-10-29 16:25:41 +00:00
Bsian cd187b21f9
Promise return fix 2019-10-29 16:24:15 +00:00
Bsian 7752c1c37a
Added ready message in console 2019-10-29 16:15:20 +00:00
Bsian 1dc0ee955b
Stop function loader from erroring 2019-10-29 16:13:40 +00:00
Bsian cff8402f7d
Added message to show which function failed 2019-10-29 16:09:12 +00:00
Bsian 3579bdd137
Added modlog creation to utils 2019-10-29 15:41:33 +00:00
Bsian 36afa4f2ed
Added usage 2019-10-29 01:13:14 +00:00
Matthew e784b124e8
edit responses for cwg and add data command 2019-10-28 20:40:24 -04:00
Matthew c4ae1d272c
edit responses for cwg and add data command 2019-10-28 20:33:30 -04:00
Matthew a2f0794838
edit responses for cwg and add data command 2019-10-28 20:30:55 -04:00
Matthew 5e556a5c4f
edit responses for cwg and add data command 2019-10-28 20:24:56 -04:00
Matthew 566b0e5936
fix typo in deleteaccount 2019-10-28 19:56:00 -04:00
Matthew ed482c9707
re-add handleError func 2019-10-28 19:54:36 -04:00
Matthew 06ab35e61d
change .us to .org 2019-10-28 19:50:45 -04:00
Matthew 4803ecece7
change .us to .org 2019-10-28 19:50:39 -04:00
Matthew 88a619134a
fixes to cwg and catch 2019-10-28 19:46:03 -04:00
Matthew f3668d06ab
rm console log statements 2019-10-28 19:14:49 -04:00
Matthew 6509466474
rm console log statements 2019-10-28 19:10:26 -04:00
Matthew 24d2da237e
rm console log statements 2019-10-28 19:09:42 -04:00
Bsian 27fa7152e1
diag 2019-10-28 22:13:45 +00:00
Bsian 633d667386
fixed function loading error 2019-10-28 22:11:08 +00:00
Bsian 6992d88a3f
Fixed nginx conf reader 2019-10-28 22:09:15 +00:00
Bsian bd14446390
Fixed cert parsing again again 2019-10-28 22:06:56 +00:00
Bsian 6a154cc4b9
Fixed cert parsing again 2019-10-28 22:05:54 +00:00
Bsian bf48fcbf96
Fixed cert parsing 2019-10-28 21:58:44 +00:00
Bsian 9703ecb4b6
Fixed more shit 2019-10-28 21:45:31 +00:00
Bsian 935d2147d3
Fixed shit 2019-10-28 21:41:23 +00:00
Bsian 1a5e72f94f
Fixed command not loading prefix 2019-10-28 21:29:06 +00:00
Bsian 51a70f84ff
Added usage 2019-10-28 21:06:52 +00:00
Bsian 602a5f854f
Again 2019-10-28 20:21:57 +00:00
Bsian 246944c3ce
Stuff? 2019-10-28 20:21:04 +00:00
Matthew 92f2ca71da
should be setINterval not settimeout 2019-10-28 00:34:42 -04:00
Matthew 79dea2e413
add lock time in embed 2019-10-28 00:30:09 -04:00
Matthew 239dd2469a
add lock time in embed 2019-10-28 00:28:20 -04:00
Matthew dcde1d685c
add lock time in embed 2019-10-28 00:27:43 -04:00
Matthew a451f153bd
Set interval time on checkLock 2019-10-28 00:26:14 -04:00
Matthew 8ccd1cac1f
delete msg for lock/unlock 2019-10-28 00:23:39 -04:00
Matthew 63d40da837
fix lock 2019-10-28 00:17:25 -04:00
Matthew 3f18050a27
fix lock issue 2019-10-28 00:12:16 -04:00
Matthew 8fea499597
fix lock issue 2019-10-28 00:11:01 -04:00
Matthew 08039c6e94
fix lock issue 2019-10-28 00:07:42 -04:00
Matthew 07001f5b6e
remove debug from modlogs 2019-10-28 00:01:30 -04:00
Matthew 998229b494
should set locked to false 2019-10-28 00:01:05 -04:00
Matthew 8d8fa5b10e
fix deprecation warning 2019-10-28 00:00:54 -04:00
Matthew d95e4d8efe
should set locked to false 2019-10-28 00:00:07 -04:00
Matthew 9e88f0f8fe
modlogs cmd fix 2019-10-27 23:58:41 -04:00
Matthew a87e108ee6
type should be number 2019-10-27 23:54:55 -04:00
Matthew c1e10751e3
modlogs cmd fix 2019-10-27 23:53:15 -04:00
Matthew 2ec2c95d9c
modlogs cmd fix 2019-10-27 23:51:26 -04:00
Matthew d6f274d4a7
modlogs cmd fix 2019-10-27 23:47:55 -04:00
Matthew 7def0455cf
fix typo 2019-10-27 23:42:08 -04:00
Matthew 661beb37b2
logID in schema should be string not number 2019-10-27 23:39:44 -04:00
Matthew a263b91551
push changes to fix query in lock/unlock 2019-10-27 23:38:23 -04:00
Matthew 353a4d8137
fix issue in loadFunctions func 2019-10-27 23:08:45 -04:00
Matthew f59aa9dc1e
rm messageCreate issue 2019-10-27 23:07:55 -04:00
Matthew 3addb4e71a
fix mongoose deprecation warnings 2019-10-27 23:05:24 -04:00
Matthew 8c887192e9
commands that req arguments w/o produce help cmd 2019-10-27 23:04:49 -04:00
Matthew 62be202a2e
trim whitespace from args 2019-10-27 23:04:35 -04:00
Matthew 9bf9440f68
fix command handler issue 2019-10-27 22:52:22 -04:00
Matthew 0f38580f1d
fix command handler issue 2019-10-27 22:50:41 -04:00
Matthew 51c8b12e84
fix command handler issue 2019-10-27 22:41:34 -04:00
Matthew e0750f7787
fix command handler issue 2019-10-27 22:38:02 -04:00
Matthew 663f87debd
fix command handler issue 2019-10-27 22:35:43 -04:00
Matthew 5ae041c1c7
fix command handler issue 2019-10-27 22:31:14 -04:00
Matthew b87f1c112b
fix command handler issue 2019-10-27 22:30:10 -04:00
Matthew 8a6b6de78f
fix command handler issue 2019-10-27 22:27:03 -04:00
Matthew 98fdd4f8ab
fix emoji in store 2019-10-27 22:26:50 -04:00
Matthew 2274959f8a
please 2019-10-27 22:25:39 -04:00
Matthew 301f9ff9a2
please 2019-10-27 22:22:40 -04:00
Matthew 8bcd610462
please 2019-10-27 22:21:16 -04:00
Matthew 2a473b65b7
sysinfo cmd embed updates 2019-10-27 22:16:27 -04:00
Matthew 9297b4774e
remove inline 2019-10-27 22:14:10 -04:00
Matthew bfde851211
fix richembed shit again 2019-10-27 22:11:57 -04:00
Matthew ec5717d0a7
fix command handler again 2019-10-27 22:03:05 -04:00
Matthew c177fb88ee
another fix attempt on eval 2019-10-27 21:54:22 -04:00
Matthew 5ce5b7f64d
another fix attempt on eval 2019-10-27 21:53:16 -04:00
Matthew d8049997a2
another fix attempt on eval 2019-10-27 21:50:11 -04:00
Matthew 1ca97d4627
another fix attempt on eval 2019-10-27 21:47:43 -04:00
Matthew e83fc9865d
another fix attempt on eval 2019-10-27 21:46:29 -04:00
Matthew 1ed93f3b5f
another fix attempt on eval 2019-10-27 21:42:39 -04:00
Matthew baf65952f6
comment shit out of eval 2019-10-27 21:40:39 -04:00
Matthew 995c5c58aa
attempt to fix RichEmbed 2019-10-27 21:36:10 -04:00
Matthew a859352f39
attempt to fix RichEmbed 2019-10-27 21:34:22 -04:00
Matthew c1975d6a91
attempt to fix RichEmbed 2019-10-27 21:31:06 -04:00
Matthew 6312fa243e
get config from client, also remove weird evalMessage thing 2019-10-27 21:23:56 -04:00
Matthew 9e5c9da6e2
add checks for presence of user/role perms before checking 2019-10-27 21:21:26 -04:00
Matthew 0633564e6a
perms is declared but never used 2019-10-27 21:18:20 -04:00
Matthew e9ae7c3ee8
a 2019-10-27 21:14:28 -04:00
Matthew c4fd0c000b
rm prompt 2019-10-27 21:09:40 -04:00
Matthew aaeb35719f
add event listeners on process in client 2019-10-27 20:54:48 -04:00
Matthew fae3eab310
prefix should come from client, not directly 2019-10-27 20:51:02 -04:00
Matthew 72e9750d2d
would help if we'd actually inst the client 2019-10-27 20:47:45 -04:00
Matthew 308320e28e
would help if we'd actually inst the client 2019-10-27 20:43:48 -04:00
Matthew 798b770d08
would help if we'd actually inst the client 2019-10-27 20:30:03 -04:00
Matthew 9eda0e9b4c
would help if we'd actually inst the client 2019-10-27 20:23:01 -04:00
Matthew 38a840e5e5
get prefix from client, not directly 2019-10-27 20:19:55 -04:00
Matthew f83b62e3c0
set process title on constructor 2019-10-27 20:17:29 -04:00
Matthew 52050f41f3
should be .org, not .us 2019-10-27 20:17:15 -04:00
Matthew 700a146856
connect success log 2019-10-27 20:10:23 -04:00
Matthew d9c1c635e7
connect to mongo 2019-10-27 20:09:31 -04:00
Matthew a633aeda9b
add functions index 2019-10-27 20:05:32 -04:00
Matthew 80d64295ee
add sysinfo cmd and dataConversion func 2019-10-27 20:05:20 -04:00
Bsian 3942e96524
Tidy and added delete account util 2019-10-27 16:22:49 +00:00
Bsian 26f0b6ef15
Added create alias 2019-10-27 15:18:18 +00:00
Bsian bc37ac49f3
Added message collector 2019-10-27 15:15:13 +00:00
Bsian 99a9a3911d
Created command 2019-10-27 01:08:42 +00:00
Bsian e71b449554
Revert "Created command" 
This reverts commit dd35b8a9d2.
 2019-10-27 01:07:36 +00:00
Bsian dd35b8a9d2
Created command 2019-10-27 01:06:57 +00:00
Bsian ca5cef1554
Removed duplicate utils file 2019-10-27 01:19:49 +01:00
Bsian 3b3fcf2513
Improvements to code 2019-10-26 19:32:56 +01:00
Bsian 851af0f0bf
Fix, don't error if dm fails 2019-10-26 18:34:29 +01:00
Bsian 80d1f5a7dd
Don't throw an error if user cannot be DMed 2019-10-26 18:33:05 +01:00
Bsian 8623ea288a
Typo fix 2019-10-26 18:30:51 +01:00
Matthew 706fb20aa9
final finishes on checkLock func 2019-10-26 13:07:05 -04:00
Matthew 2c8dc89a42
use util binded to client on messageCreate 2019-10-26 13:06:54 -04:00
Matthew be6866fbd3
add unlock command 2019-10-26 13:06:40 -04:00
Matthew 06c4390549
use util binded to client on modlogs 2019-10-26 13:06:32 -04:00
Matthew 57f5c2a01c
type on lock should be 2 2019-10-26 13:06:18 -04:00
Matthew 7a025137e4
update /src index 2019-10-26 00:04:00 -04:00
Matthew 5badce06e3
Add nginx.conf file for CWG cmd template 2019-10-26 00:03:49 -04:00
Matthew 70c7e3f698
bind new util and new load functions func 2019-10-26 00:02:44 -04:00
Matthew 38f48bb324
change 'account' field in Moderation model to 'username' 2019-10-26 00:02:26 -04:00
Matthew 0e13cfaf48
change 'account' field in Account model to 'username' 2019-10-26 00:02:09 -04:00
Matthew 93c5cd0df9
Add interval func to check lock expirations 2019-10-26 00:01:49 -04:00
Matthew 74877e8a34
update Moderation model references in modlogs cmd 2019-10-26 00:01:31 -04:00
Matthew 420e1f8d2e
[WIP] cwg command for nginx handling 2019-10-26 00:01:16 -04:00
Matthew d33f92bf62
add new lock command 2019-10-26 00:01:02 -04:00
Matthew 4659cc5cd3
mv 2019-10-26 00:00:44 -04:00
Matthew 8388caacb4
move Util to class dir 2019-10-26 00:00:29 -04:00
Bsian f3347c95e0
index 2019-10-22 01:22:33 +01:00
Bsian 27c4202eb7
Added exec command 2019-10-22 01:21:25 +01:00
Bsian e1d7237bce
Better code 2019-10-22 01:20:11 +01:00
Bsian 22bd0f5a42
Added haste upload fallback so command won't disable 2019-10-22 01:02:01 +01:00