X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fplugs%2Foauth_plug.ex;h=630f15eec8e837af098a153bfff666567fd611ee;hb=9938fa3293478e0dfe5f8d82c1526e0cd3747cf1;hp=775423bb11a9435c9c800b77ba26b1d3c57e017e;hpb=59770c3f5c9a038dbde6b2e1cd1551a7b8f1672b;p=akkoma

diff --git a/lib/pleroma/plugs/oauth_plug.ex b/lib/pleroma/plugs/oauth_plug.ex
index 775423bb1..630f15eec 100644
--- a/lib/pleroma/plugs/oauth_plug.ex
+++ b/lib/pleroma/plugs/oauth_plug.ex
@@ -9,14 +9,18 @@ defmodule Pleroma.Plugs.OAuthPlug do
   end
 
   def call(%{assigns: %{user: %User{}}} = conn, _), do: conn
+
   def call(conn, _) do
-    token = case get_req_header(conn, "authorization") do
-              ["Bearer " <> header] -> header
-              _ -> get_session(conn, :oauth_token)
-            end
+    token =
+      case get_req_header(conn, "authorization") do
+        ["Bearer " <> header] -> header
+        _ -> get_session(conn, :oauth_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