Merge branch 'Cockatrice:master' into master

This commit is contained in:
Donald Haase 2021-06-24 00:32:08 -04:00 committed by GitHub
commit f226a961c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
365 changed files with 23933 additions and 3642 deletions

View file

@ -169,27 +169,27 @@ minpasswordlength = 6
[forgotpassword]
; Servatrice can process forgot password requests allowing users to reset their account
; Servatrice can process reset password requests allowing users to reset their account
; passwords in the event they forget it. Should this feature be enabled? Default: false.
; enable=false
; Forgot password request should not be allowed to stay valid forever. This settings
; informs servatrice how long a players forgot password reset token is valid for (in minutes).
; Reset password request should not be allowed to stay valid forever. This settings
; informs servatrice how long a players reset password reset token is valid for (in minutes).
; Default: 60
; tokenlife=60
; Servatrice can challenge users that are making forgot password requests to answer
; Servatrice can challenge users that are making reset password requests to answer
; questions in regards to their account to help validate they are the true owner of the account.
; Should this feature be enabled? Default: false
; enablechallenge=false
; Email subject for the forgot password emails
; subject="Cockatrice forgot password token"
; Email subject for the reset password emails
; subject="Cockatrice reset password token"
; Forgot password email body. You can use these tags here: %username %token
; Reset password email body. You can use these tags here: %username %token
; They will be substituted with the actual values in the email
;
; body="Hi %username, sorry to hear you forgot your password on our Cockatrice server\r\nHere's the token to use to reset your account password:\r\n\r\n%token\r\n\r\nHappy gaming!"
; body="Hi %username,\r\nthanks for reaching out to us with your password reset request for our Cockatrice server.\r\nHere's your unique token in order to reset your account password in the app:\r\n\r\n%token\r\n\r\nHappy gaming!"
[smtp]
@ -347,7 +347,7 @@ max_message_size_per_interval=1000
; Maximum number of messages in an interval before new messages gets dropped; default is 10
max_message_count_per_interval=10
; Maximum number of games a single user can create; default is 5
; Maximum number of games a single user can create; default is 5; set to -1 to disable; 0 disallows game creation
max_games_per_user=5
; Servatrice can avoid users from flooding games with large number of game commands in an interval of time.