[#114] Addressed MR comments. Removed functionality to be extracted to other MRs.

diff --git a/config/config.exs b/config/config.exs
index 410b3c618d84b81d6478ce131cc43f5de456417a..1401b0a3dadabe90c276c04b97df163aee154c11 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -101,8 +101,6 @@ config :pleroma, :instance,
   finmoji_enabled: true,
   mrf_transparency: true
 
-config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local
-
 config :pleroma, :markup,
   # XXX - unfortunately, inline images must be enabled by default right now, because
   # of custom emoji.  Issue #275 discusses defanging that somehow.

diff --git a/config/dev.exs b/config/dev.exs
index 166be721aade416f6d73c07d334c2ed517541319..080a2f8dbcdd8f0a21cf4b22d0a41024094537a0 100644 (file)
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -17,6 +17,8 @@ config :pleroma, Pleroma.Web.Endpoint,
   check_origin: false,
   watchers: []
 
+config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local
+
 # ## SSL Support
 #
 # In order to use HTTPS in development, a self-signed

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 6a2e0d6c4da55112e76996d01a07c8c713d217ec..6253a28dbf8b9d90dd727097ecdf81fc02712068 100644 (file)
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -278,7 +278,6 @@ 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)
@@ -313,8 +312,6 @@ 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 cbde45e52fbbfd4f5eaf8d128b93c827fa6821a6..b1e4c77e86ad4b0a361218fa0588c714b1cb3408 100644 (file)
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -166,9 +166,6 @@ 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, 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 a45fdcf517d8e0bdf5220e99a35e54686663f33a..38eff8191785da354ed9b5dedeb8d83092855cb6 100644 (file)
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -333,10 +333,6 @@ 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})