aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2018-12-12 20:15:43 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2018-12-12 20:15:43 +0300
commitbfff2399ff2d7b479b066c6f92bf9331f80bb914 (patch)
tree1f3d9eb37b51b64187d2bad2db61f3541c8a7002 /lib
parente3a21bcd45dd1f27a2f6a74041d86c64ad8256e9 (diff)
downloadpleroma-bfff2399ff2d7b479b066c6f92bf9331f80bb914.tar.gz
[#114] Routes and config for `confirm_email` and `email_invite` (Twitter API).
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/router.ex3
-rw-r--r--lib/pleroma/web/twitter_api/controllers/util_controller.ex3
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex4
3 files changed, 10 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 6253a28db..6a2e0d6c4 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -278,6 +278,7 @@ defmodule Pleroma.Web.Router do
post("/account/register", TwitterAPI.Controller, :register)
post("/account/password_reset", TwitterAPI.Controller, :password_reset)
+ get("/account/confirm_email", TwitterAPI.Controller, :confirm_email)
get("/search", TwitterAPI.Controller, :search)
get("/statusnet/tags/timeline/:tag", TwitterAPI.Controller, :public_and_external_timeline)
@@ -312,6 +313,8 @@ defmodule Pleroma.Web.Router do
post("/account/update_profile_banner", TwitterAPI.Controller, :update_banner)
post("/qvitter/update_background_image", TwitterAPI.Controller, :update_background)
+ post("/email_invite", TwitterAPI.Controller, :email_invite)
+
get("/statuses/home_timeline", TwitterAPI.Controller, :friends_timeline)
get("/statuses/friends_timeline", TwitterAPI.Controller, :friends_timeline)
get("/statuses/mentions", TwitterAPI.Controller, :mentions_timeline)
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index b1e4c77e8..cacfbbf91 100644
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -166,6 +166,9 @@ 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, true), 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 479c92381..911dd6a48 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -340,6 +340,10 @@ 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})