hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#114] Moved email_invite action to AdminAPIController, adjusted tests.

Browse source
This commit is contained in:
Ivan Tashkinov 2018-12-13 18:23:05 +03:00
commit a89e3b4b60
5 changed files with 46 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View file

@ -335,18 +335,6 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
def confirm_email(_conn, _params), do: :noop
def email_invite(%{assigns: %{user: user}} = conn, %{"email" => email} = params) do
with true <-
Pleroma.Config.get([:instance, :invites_enabled]) &&
!Pleroma.Config.get([:instance, :registrations_open]),
{:ok, invite_token} <- Pleroma.UserInviteToken.create_token(),
email <-
Pleroma.UserEmail.user_invitation_email(user, invite_token, email, params["name"]),
{:ok, _} <- Pleroma.Mailer.deliver(email) do
json_response(conn, :no_content, "")
end
end
def update_avatar(%{assigns: %{user: user}} = conn, params) do
{:ok, object} = ActivityPub.upload(params, type: :avatar)
change = Changeset.change(user, %{avatar: object.data})