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

[#114] Initial implementation of user email invitations.

Browse source
This commit is contained in:
Ivan Tashkinov 2018-12-13 14:30:48 +03:00
commit 00744c6b03
4 changed files with 67 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View file

@ -168,7 +168,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
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, true), do: "1", else: "0"),
invitesEnabled: if(Keyword.get(instance, :invites_enabled, false), do: "1", else: "0"),
vapidPublicKey: vapid_public_key
}

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

@ -335,7 +335,13 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
def confirm_email(_conn, _params), do: :noop
def email_invite(_conn, _params), do: :noop
def email_invite(%{assigns: %{user: user}} = conn, %{"email" => email} = params) do
with true <- Pleroma.Config.get([:instance, :invites_enabled]),
email <- Pleroma.UserEmail.user_invitation_email(user, 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)