[#114] Addressed MR comments. Removed functionality to be extracted to other MRs.

This commit is contained in:
Ivan Tashkinov 2018-12-14 12:09:55 +03:00
commit f81213910f
5 changed files with 2 additions and 12 deletions

View file

@ -166,9 +166,6 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
textlimit: to_string(Keyword.get(instance, :limit)),
closed: if(Keyword.get(instance, :registrations_open), do: "0", else: "1"),
private: if(Keyword.get(instance, :public, true), do: "0", else: "1"),
accountActivationRequired:
if(Keyword.get(instance, :account_activation_required, false), do: "1", else: "0"),
invitesEnabled: if(Keyword.get(instance, :invites_enabled, false), do: "1", else: "0"),
vapidPublicKey: vapid_public_key
}

View file

@ -333,10 +333,6 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
end
end
def confirm_email(_conn, _params), do: :noop
def email_invite(_conn, _params), do: :noop
def update_avatar(%{assigns: %{user: user}} = conn, params) do
{:ok, object} = ActivityPub.upload(params, type: :avatar)
change = Changeset.change(user, %{avatar: object.data})