Silversthorn
056856cf98
Fixing Helpers issue
2022-05-26 15:02:47 +02:00
Silversthorn
8423cc24c1
I'm breaking/fixing stuff
2022-05-26 14:50:20 +02:00
Andrew
39915ef53c
Fix critical bad stats push
2022-05-26 06:49:51 -04:00
luukas
47fc398f26
Fix CORS preflight
2022-05-26 00:31:58 +03:00
Andrew
b0b9936df7
Merge branch 'bugfix/stats-db-select' into 'dev'
...
Get rid of the stats database proxy
See merge request crafty-controller/crafty-4!276
2022-05-25 18:29:23 +00:00
Andrew
b293164e12
Add crash detection to realtime stats
2022-05-25 14:26:13 -04:00
luukas
8ce7a96071
Use a better ANSI escape regex in the API logs
2022-05-25 18:41:41 +03:00
luukas
2e51fa9629
Remove newline characters from API file logs
2022-05-25 18:41:16 +03:00
luukas
3956d9c699
Remove stdin sending from command_watcher
...
Reasons:
* It's unused in our program
* It can be a start to security vulnerabilities.
I've seen many routes add commands to `Commands` without validation.
2022-05-25 17:44:09 +03:00
Silversthorn
5a1353373a
trying something new
2022-05-25 15:54:35 +02:00
luukas
ca450f21ed
Document set_passwd and threads prompt commands
...
Help messages:
set_passwd: Set a user's password. Example: set_passwd admin
threads: Get all of the Python threads used by Crafty
2022-05-25 16:25:49 +03:00
luukas
8e13b4e11d
Simplify helpers setting methods
2022-05-25 16:21:34 +03:00
luukas
0eac0721ea
Remove unused DatabaseShortcuts imports
2022-05-25 16:17:01 +03:00
luukas
4e84eee5a5
Rename server stats variables to server_stats
2022-05-25 16:15:51 +03:00
luukas
83018c6860
Calculate the min stats date with timedelta
...
This is more correct than just using days.
I've also tested this working in a completely separate Peewee project.
2022-05-25 16:14:42 +03:00
luukas
a937a94ac8
Use a better variable name for stat disappear date
...
* Rename occurences of `last_week` with `minimum_to_exist`
2022-05-25 14:49:17 +03:00
luukas
4b707aa9d1
Don't use get_latest_server_stats
...
Use get_server_stats_by_id instead of get_latest_server_stats
The reasoning behind this is that all usages of get_latest_server_stats
had `DatabaseShortcuts.return_rows(latest)[0]`, which
get_server_stats_by_id already did
2022-05-25 14:43:05 +03:00
luukas
166272e12c
Replace .count() != 0 with .exists()
2022-05-25 14:24:34 +03:00
luukas
fae4aeb492
Fix CQ C0412
2022-05-25 14:16:14 +03:00
luukas
cf2ff2f2d5
Try to get rid of database_stats_proxy
2022-05-25 14:00:22 +03:00
Iain Powrie
8f1630b6a2
Merge branch 'devops/gitlab-scanning-pipes' into 'dev'
...
Add Dependancy, SAST, Container, Secret Scanning
See merge request crafty-controller/crafty-4!274
2022-05-25 00:52:00 +00:00
Iain Powrie
d386244e86
Add Dependancy, SAST, Container, Secret Scanning
2022-05-25 00:52:00 +00:00
Andrew
7ca7232829
Add question to warning message
2022-05-24 19:11:14 -04:00
Iain Powrie
54c81d6dd4
Merge branch 'bugfix/api-v2-bugfixes' into 'dev'
...
API v2 bug fixes
See merge request crafty-controller/crafty-4!267
2022-05-24 22:42:41 +00:00
luukas
2ac9118152
Merge remote's bugfix/api-v2-bugfixes to local
2022-05-25 00:58:32 +03:00
luukas
cbc73b7e92
Fix routing for the user permissions handler
2022-05-25 00:58:10 +03:00
luukas
57ef5e27dd
Add route for viewing user Crafty permissions
...
The route includes the permission mask, counters and limits
2022-05-25 00:55:49 +03:00
luukas
6dadce2c9a
Enable changing more of yourself with superuser
...
Enable modifying your own superuser status, permissions and roles if you
have superuser status
2022-05-25 00:43:49 +03:00
luukas
b0d342e949
Check if something is in a dict with a simpler way
...
* Replace `data.get("key", None) is not None` with `"key" in data`
2022-05-25 00:39:16 +03:00
luukas
2aa2d14f5e
Improve the invalidate tokens API handler
...
* Remove the TODO
* Replace the Console.info with logger.debug
2022-05-25 00:35:11 +03:00
luukas
9a9d101015
Add pasword hashing to API user modification
2022-05-25 00:32:31 +03:00
luukas
54ff888002
Fix user modification via the API
2022-05-25 00:29:31 +03:00
Iain Powrie
db13b11f18
Merge branch 'tweak/pretzel-wss-error' into 'dev'
...
Add link to documentation to WSS error
See merge request crafty-controller/crafty-4!272
2022-05-24 18:14:06 +00:00
Iain Powrie
71dde6edba
Merge branch 'translations/hebrew' into 'dev'
...
Add Hebrew lang file @ 3.5 stage
See merge request crafty-controller/crafty-4!273
2022-05-24 18:03:45 +00:00
Zedifus
f69cf39c1d
Add Hebrew lang file
...
Up to date to 3.5, altered credits trans keys amended,
Patreon will need amended to Patreon / Ko-fi like en lang,
this will be done on final beta translation update.
Thanks thefourcraft
2022-05-24 18:58:37 +01:00
Andrew
5104c34513
Add link to documentation to WSS error
2022-05-23 21:23:29 -04:00
Zedifus
d0596af4c9
Add exemption orjson no-member falsepositive
2022-05-23 22:54:06 +01:00
Craft Breadth
6fa2aa93a5
Merge branch 'tweak/patgen-credits-format-update' into 'dev'
...
Update credits panel for new PatGen format update
See merge request crafty-controller/crafty-4!270
2022-05-23 21:31:42 +00:00
Zedifus
2a4295d9b3
Add subscription source parsing & format html
2022-05-23 22:21:32 +01:00
Zedifus
11335b58f3
Update Translations for kofi credit support
...
More sane key naming as multiple sources, title & desc update too.
2022-05-23 22:20:19 +01:00
luukas
afdffcd836
Optimize get_user_permissions_mask
2022-05-23 23:03:50 +03:00
Zedifus
4205c0a8f0
Exempt jsonschema falsepositive E0611
...
Can't understand why these are flagging, code is as per docs.
Version is latest, and not flagging locally. Going to exempt mod for now
2022-05-23 20:53:23 +01:00
luukas
4c981f50c2
Add more permission validation in user creation
2022-05-23 22:45:27 +03:00
Zedifus
ab022a65ed
Version bumping jsonlint
...
Checking if this is causing lint issue
2022-05-23 20:35:43 +01:00
luukas
0d62223982
Merge branch 'dev' into bugfix/api-v2-bugfixes
2022-05-23 20:20:49 +03:00
Iain Powrie
da483b9291
Merge branch 'bug/pretzel-database-exit' into 'dev'
...
Fix error where database atomic is not needed
See merge request crafty-controller/crafty-4!269
2022-05-23 10:05:46 +00:00
Iain Powrie
f01f04ef97
Merge branch 'merge/cleanup-nosquash' into 'dev'
...
New merge request for cleanup
See merge request crafty-controller/crafty-4!268
2022-05-23 10:01:40 +00:00
Andrew
f099639cc6
Fix error where database atomic is not needed
2022-05-21 14:26:58 -04:00
luukas
8f8b2aa22f
Simplify MainPrompt.emptyline.
2022-05-21 02:04:03 +03:00
luukas
b49bca3279
Use a tab character in the threads prompt command
...
https://i.imgur.com/jy0Rlgm.png
2022-05-21 01:57:40 +03:00
