luna/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#114] Routes and config for confirm_email and email_invite (Twitter API).

Browse source
This commit is contained in:
Ivan Tashkinov 2018-12-12 20:15:43 +03:00
parent e3a21bcd45
commit bfff2399ff
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/router.ex
View file

@ -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)

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

@ -166,6 +166,9 @@ def config(conn, _params) 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
}

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

@ -340,6 +340,10 @@ def password_reset(conn, params) 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})