Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex

1 files changed, 0 insertions, 49 deletions

diff --git a/lib/pleroma/web/oauth/token/query.ex b/lib/pleroma/web/oauth/token/query.ex
deleted file mode 100644
index fd6d9b112..000000000
--- a/lib/pleroma/web/oauth/token/query.ex
+++ /dev/null
@@ -1,49 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.OAuth.Token.Query do
-  @moduledoc """
-  Contains queries for OAuth Token.
-  """
-
-  import Ecto.Query, only: [from: 2]
-
-  @type query :: Ecto.Queryable.t() | Token.t()
-
-  alias Pleroma.Web.OAuth.Token
-
-  @spec get_by_refresh_token(query, String.t()) :: query
-  def get_by_refresh_token(query \\ Token, refresh_token) do
-    from(q in query, where: q.refresh_token == ^refresh_token)
-  end
-
-  @spec get_by_token(query, String.t()) :: query
-  def get_by_token(query \\ Token, token) do
-    from(q in query, where: q.token == ^token)
-  end
-
-  @spec get_by_app(query, String.t()) :: query
-  def get_by_app(query \\ Token, app_id) do
-    from(q in query, where: q.app_id == ^app_id)
-  end
-
-  @spec get_by_id(query, String.t()) :: query
-  def get_by_id(query \\ Token, id) do
-    from(q in query, where: q.id == ^id)
-  end
-
-  @spec get_by_user(query, String.t()) :: query
-  def get_by_user(query \\ Token, user_id) do
-    from(q in query, where: q.user_id == ^user_id)
-  end
-
-  @spec preload(query, any) :: query
-  def preload(query \\ Token, assoc_preload \\ [])
-
-  def preload(query, assoc_preload) when is_list(assoc_preload) do
-    from(q in query, preload: ^assoc_preload)
-  end
-
-  def preload(query, _assoc_preload), do: query
-end