X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frouter.ex;h=beca1581e8587d9aa09de293bafabbc58e2333d9;hb=5719f69ae338bce2419a6ea572f34a68fda5d23c;hp=161635558b6ddcec1b1040d62fec44903b95826c;hpb=f0d41a3abf3e584c90c96644f73d533ea0680237;p=akkoma

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 161635558..beca1581e 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -21,6 +21,13 @@ defmodule Pleroma.Web.Router do
     plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Router.user_fetcher/1}
   end
 
+  pipeline :mastodon_html do
+    plug :accepts, ["html"]
+    plug :fetch_session
+    plug Pleroma.Plugs.OAuthPlug
+    plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Router.user_fetcher/1, optional: true}
+  end
+
   pipeline :well_known do
     plug :accepts, ["xml", "xrd+xml"]
   end
@@ -33,6 +40,17 @@ defmodule Pleroma.Web.Router do
     plug :accepts, ["html", "json"]
   end
 
+  pipeline :pleroma_api do
+    plug :accepts, ["html", "json"]
+  end
+
+  scope "/api/pleroma", Pleroma.Web.TwitterAPI do
+    pipe_through :pleroma_api
+    get "/password_reset/:token", UtilController, :show_password_reset
+    post "/password_reset", UtilController, :password_reset
+    get "/emoji", UtilController, :emoji
+  end
+
   scope "/oauth", Pleroma.Web.OAuth do
     get "/authorize", OAuthController, :authorize
     post "/authorize", OAuthController, :create_authorization
@@ -40,24 +58,31 @@ defmodule Pleroma.Web.Router do
   end
 
   scope "/api/v1", Pleroma.Web.MastodonAPI do
-    pipe_through :api
-    get "/instance", MastodonAPIController, :masto_instance
-    post "/apps", MastodonAPIController, :create_app
+    pipe_through :authenticated_api
 
-    get "/timelines/public", MastodonAPIController, :public_timeline
+    patch "/accounts/update_credentials", MastodonAPIController, :update_credentials
+    get "/accounts/verify_credentials", MastodonAPIController, :verify_credentials
+    get "/accounts/relationships", MastodonAPIController, :relationships
+    get "/accounts/search", MastodonAPIController, :account_search
+    post "/accounts/:id/follow", MastodonAPIController, :follow
+    post "/accounts/:id/unfollow", MastodonAPIController, :unfollow
+    post "/accounts/:id/block", MastodonAPIController, :block
+    post "/accounts/:id/unblock", MastodonAPIController, :unblock
+    post "/accounts/:id/mute", MastodonAPIController, :relationship_noop
+    post "/accounts/:id/unmute", MastodonAPIController, :relationship_noop
 
-    get "/statuses/:id", MastodonAPIController, :get_status
-    get "/statuses/:id/context", MastodonAPIController, :get_context
+    post "/follows", MastodonAPIController, :follow
 
-    get "/accounts/:id/statuses", MastodonAPIController, :user_statuses
-  end
+    get "/blocks", MastodonAPIController, :blocks
 
-  scope "/api/v1", Pleroma.Web.MastodonAPI do
-    pipe_through :authenticated_api
+    get "/domain_blocks", MastodonAPIController, :empty_array
+    get "/follow_requests", MastodonAPIController, :empty_array
+    get "/mutes", MastodonAPIController, :empty_array
 
-    get "/accounts/verify_credentials", MastodonAPIController, :verify_credentials
     get "/timelines/home", MastodonAPIController, :home_timeline
 
+    get "/favourites", MastodonAPIController, :favourites
+
     post "/statuses", MastodonAPIController, :post_status
     delete "/statuses/:id", MastodonAPIController, :delete_status
 
@@ -65,7 +90,34 @@ defmodule Pleroma.Web.Router do
     post "/statuses/:id/favourite", MastodonAPIController, :fav_status
     post "/statuses/:id/unfavourite", MastodonAPIController, :unfav_status
 
+    post "/notifications/clear", MastodonAPIController, :clear_notifications
+    post "/notifications/dismiss", MastodonAPIController, :dismiss_notification
     get "/notifications", MastodonAPIController, :notifications
+    get "/notifications/:id", MastodonAPIController, :get_notification
+
+    post "/media", MastodonAPIController, :upload
+  end
+
+  scope "/api/v1", Pleroma.Web.MastodonAPI do
+    pipe_through :api
+    get "/instance", MastodonAPIController, :masto_instance
+    post "/apps", MastodonAPIController, :create_app
+    get "/custom_emojis", MastodonAPIController, :custom_emojis
+
+    get "/timelines/public", MastodonAPIController, :public_timeline
+    get "/timelines/tag/:tag", MastodonAPIController, :hashtag_timeline
+
+    get "/statuses/:id", MastodonAPIController, :get_status
+    get "/statuses/:id/context", MastodonAPIController, :get_context
+    get "/statuses/:id/favourited_by", MastodonAPIController, :favourited_by
+    get "/statuses/:id/reblogged_by", MastodonAPIController, :reblogged_by
+
+    get "/accounts/:id/statuses", MastodonAPIController, :user_statuses
+    get "/accounts/:id/followers", MastodonAPIController, :followers
+    get "/accounts/:id/following", MastodonAPIController, :following
+    get "/accounts/:id", MastodonAPIController, :user
+
+    get "/search", MastodonAPIController, :search
   end
 
   scope "/api", Pleroma.Web do
@@ -77,6 +129,9 @@ defmodule Pleroma.Web.Router do
     get "/statusnet/version", TwitterAPI.UtilController, :version
   end
 
+  @instance Application.get_env(:pleroma, :instance)
+  @registrations_open Keyword.get(@instance, :registrations_open)
+
   scope "/api", Pleroma.Web do
     pipe_through :api
 
@@ -85,13 +140,17 @@ defmodule Pleroma.Web.Router do
     get "/statuses/networkpublic_timeline", TwitterAPI.Controller, :public_and_external_timeline
     get "/statuses/user_timeline", TwitterAPI.Controller, :user_timeline
     get "/qvitter/statuses/user_timeline", TwitterAPI.Controller, :user_timeline
+    get "/users/show", TwitterAPI.Controller, :show_user
 
     get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status
     get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation
 
-    post "/account/register", TwitterAPI.Controller, :register
+    if @registrations_open do
+      post "/account/register", TwitterAPI.Controller, :register
+    end
 
-    get "/externalprofile/show", TwitterAPI.Controller, :external_profile
+    get "/search", TwitterAPI.Controller, :search
+    get "/statusnet/tags/timeline/:tag", TwitterAPI.Controller, :public_and_external_timeline
   end
 
   scope "/api", Pleroma.Web do
@@ -117,6 +176,8 @@ defmodule Pleroma.Web.Router do
 
     post "/friendships/create", TwitterAPI.Controller, :follow
     post "/friendships/destroy", TwitterAPI.Controller, :unfollow
+    post "/blocks/create", TwitterAPI.Controller, :block
+    post "/blocks/destroy", TwitterAPI.Controller, :unblock
 
     post "/statusnet/media/upload", TwitterAPI.Controller, :upload
     post "/media/upload", TwitterAPI.Controller, :upload_json
@@ -129,6 +190,12 @@ defmodule Pleroma.Web.Router do
 
     get "/statuses/followers", TwitterAPI.Controller, :followers
     get "/statuses/friends", TwitterAPI.Controller, :friends
+    get "/friends/ids", TwitterAPI.Controller, :friends_ids
+    get "/friendships/no_retweets/ids", TwitterAPI.Controller, :empty_array
+
+    get "/mutes/users/ids", TwitterAPI.Controller, :empty_array
+
+    get "/externalprofile/show", TwitterAPI.Controller, :external_profile
   end
 
   pipeline :ostatus do
@@ -156,6 +223,14 @@ defmodule Pleroma.Web.Router do
     get "/webfinger", WebFinger.WebFingerController, :webfinger
   end
 
+  scope "/web", Pleroma.Web.MastodonAPI do
+    pipe_through :mastodon_html
+
+    get "/login", MastodonAPIController, :login
+    post "/login", MastodonAPIController, :login_post
+    get "/*path", MastodonAPIController, :index
+  end
+
   scope "/", Fallback do
     get "/*path", RedirectController, :redirector
   end