jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bans: fix exception when user with expired ban logs in.

Browse Source 
`ban.destroy` fails because users have many `bans`, not a single `ban`.
Destroying the expired ban isn't necessary anyway.
This commit is contained in:
evazion
2017-05-07 12:10:26 -05:00
parent b6e1958917
commit fd291c8b42
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/logical/session_loader.rb
View File

@@ -20,7 +20,7 @@ class SessionLoader
end
if CurrentUser.user
CurrentUser.user.unban! if ban_expired?
CurrentUser.user.unban! if CurrentUser.user.ban_expired?
else
CurrentUser.user = AnonymousUser.new
end
@@ -86,10 +86,6 @@ private
session[:user_id] = CurrentUser.user.id
end
def ban_expired?
CurrentUser.user.is_banned? && CurrentUser.user.recent_ban && CurrentUser.user.recent_ban.expired?
end
def cookie_password_hash_valid?
cookies[:password_hash] && cookies.signed[:user_name] && User.authenticate_cookie_hash(cookies.signed[:user_name], cookies[:password_hash])
end