about summary refs log tree commit diff
path: root/config/routes.rb
diff options
context:
space:
mode:
authorAnthony Bellew <anthonyreflected@gmail.com>2017-01-03 11:51:35 -0700
committerGitHub <noreply@github.com>2017-01-03 11:51:35 -0700
commitde154dbd5dbb04d083f5a66dc288d9fef7006c01 (patch)
tree88a1715021c33add55501351dbf74950deeac481 /config/routes.rb
parentc3e9ba6a66bfcb9e33edebc73adea0a17d7f02a6 (diff)
parente6657d7342ee1ce08973bf1e5ab89e423eb8b760 (diff)
Merge pull request #1 from Gargron/master
Catchup merge
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb21
1 files changed, 15 insertions, 6 deletions
diff --git a/config/routes.rb b/config/routes.rb
index e8c8f619d..18c239c48 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -31,6 +31,9 @@ Rails.application.routes.draw do
       end
     end
 
+    get :remote_follow,  to: 'remote_follow#new'
+    post :remote_follow, to: 'remote_follow#create'
+
     member do
       get :followers
       get :following
@@ -48,12 +51,9 @@ Rails.application.routes.draw do
   resources :media, only: [:show]
   resources :tags,  only: [:show]
 
-  resources :follow_requests do
-    member do
-      post :authorize
-      post :reject
-    end
-  end
+  # Remote follow
+  get  :authorize_follow, to: 'authorize_follow#new'
+  post :authorize_follow, to: 'authorize_follow#create'
 
   namespace :admin do
     resources :pubsubhubbub, only: [:index]
@@ -103,8 +103,17 @@ Rails.application.routes.draw do
       resources :follows,  only: [:create]
       resources :media,    only: [:create]
       resources :apps,     only: [:create]
+      resources :blocks,   only: [:index]
+
+      resources :follow_requests, only: [:index] do
+        member do
+          post :authorize
+          post :reject
+        end
+      end
 
       resources :notifications, only: [:index]
+      resources :favourites,    only: [:index]
 
       resources :accounts, only: [:show] do
         collection do