erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Merge 2b8292aba5 into a50c8e951f

Browse source
This commit is contained in:
Claire 2024-07-31 14:07:09 +00:00 committed by GitHub
commit a733f4e535
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -68,7 +68,7 @@ Mastodon acts as an OAuth2 provider, so 3rd party apps can use the REST and Stre
### Requirements ### Requirements
- **PostgreSQL** 12+ - **PostgreSQL** 12+
- **Redis** 4+ - **Redis** 6.2+
- **Ruby** 3.1+ - **Ruby** 3.1+
- **Node.js** 18+ - **Node.js** 18+

4
app/controllers/auth/sessions_controller.rb
View file

@ -183,9 +183,7 @@ class Auth::SessionsController < Devise::SessionsController
) )
# Only send a notification email every hour at most # Only send a notification email every hour at most
return if redis.get("2fa_failure_notification:#{user.id}").present? return if redis.set("2fa_failure_notification:#{user.id}", '1', ex: 1.hour, get: true).present?
redis.set("2fa_failure_notification:#{user.id}", '1', ex: 1.hour)
UserMailer.failed_2fa(user, request.remote_ip, request.user_agent, Time.now.utc).deliver_later! UserMailer.failed_2fa(user, request.remote_ip, request.user_agent, Time.now.utc).deliver_later!
end end