projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
plugs
/
oauth_plug.ex
diff --git
a/lib/pleroma/plugs/oauth_plug.ex
b/lib/pleroma/plugs/oauth_plug.ex
index 775423bb11a9435c9c800b77ba26b1d3c57e017e..be737dc9a22e7738893fee460879db7bf6262bba 100644
(file)
--- a/
lib/pleroma/plugs/oauth_plug.ex
+++ b/
lib/pleroma/plugs/oauth_plug.ex
@@
-16,7
+16,8
@@
defmodule Pleroma.Plugs.OAuthPlug do
end
with token when not is_nil(token) <- token,
%Token{user_id: user_id} <- Repo.get_by(Token, token: token),
end
with token when not is_nil(token) <- token,
%Token{user_id: user_id} <- Repo.get_by(Token, token: token),
- %User{} = user <- Repo.get(User, user_id) do
+ %User{} = user <- Repo.get(User, user_id),
+ false <- !!user.info["deactivated"] do
conn
|> assign(:user, user)
else
conn
|> assign(:user, user)
else