aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2018-12-13 14:30:48 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2018-12-13 14:30:48 +0300
commit00744c6b03d043defcf87696f539d65e41ad6a62 (patch)
tree8606ac61017bba236b8613be94e9c7817119759f /lib
parent908943352fe2d81c34323a5571ad5c1d391969e1 (diff)
downloadpleroma-00744c6b03d043defcf87696f539d65e41ad6a62.tar.gz
[#114] Initial implementation of user email invitations.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/emails/user_email.ex30
-rw-r--r--lib/pleroma/web/twitter_api/controllers/util_controller.ex2
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex8
3 files changed, 35 insertions, 5 deletions
diff --git a/lib/pleroma/emails/user_email.ex b/lib/pleroma/emails/user_email.ex
index 46d8b9c2d..47dcd42e0 100644
--- a/lib/pleroma/emails/user_email.ex
+++ b/lib/pleroma/emails/user_email.ex
@@ -9,10 +9,13 @@ defmodule Pleroma.UserEmail do
defp instance_name, do: instance_config()[:name]
- defp from do
+ defp sender do
{instance_name(), instance_config()[:email]}
end
+ defp recipient(email, nil), do: email
+ defp recipient(email, name), do: {name, email}
+
def password_reset_email(user, password_reset_token) when is_binary(password_reset_token) do
password_reset_url =
Router.Helpers.util_url(
@@ -29,9 +32,30 @@ defmodule Pleroma.UserEmail do
"""
new()
- |> to({user.name, user.email})
- |> from(from())
+ |> to(recipient(user.email, user.name))
+ |> from(sender())
|> subject("Password reset")
|> html_body(html_body)
end
+
+ def user_invitation_email(user, to_email, to_name \\ nil) do
+ registration_url =
+ Router.Helpers.redirect_url(
+ Endpoint,
+ :registration_page,
+ ""
+ )
+
+ html_body = """
+ <h3>You are invited to #{instance_name()}</h3>
+ <p>#{user.name} invites you to join #{instance_name()}, an instance of Pleroma federated social networking platform.</p>
+ <p>Click the following link to register: <a href="#{registration_url}">accept invitation</a>.</p>
+ """
+
+ new()
+ |> to(recipient(to_email, to_name))
+ |> from(sender())
+ |> subject("Invitation to #{instance_name()}")
+ |> html_body(html_body)
+ end
end
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index cacfbbf91..cbde45e52 100644
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -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
}
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index a45fdcf51..d51d71299 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -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)