Add ability to use remote follow function on other sites

This commit is contained in:
Eugen Rochko 2016-12-29 16:54:54 +01:00
parent 8b94d283fb
commit d7dc84439c
18 changed files with 166 additions and 32 deletions

View file

@ -45,7 +45,7 @@ module Mastodon
config.browserify_rails.commandline_options = '--transform [ babelify --presets [ es2015 react ] ] --extension=".jsx"'
config.to_prepare do
Doorkeeper::AuthorizationsController.layout 'auth'
Doorkeeper::AuthorizationsController.layout 'public'
end
config.action_dispatch.default_headers = {

View file

@ -26,6 +26,11 @@ en:
resend_confirmation: Resend confirmation instructions
reset_password: Reset password
set_new_password: Set new password
authorize_follow:
error: Unfortunately, there was an error looking up the remote account
follow: Follow
prompt_html: 'You (<strong>%{self}</strong>) have requested to follow:'
title: Follow %{acct}
datetime:
distance_in_words:
about_x_hours: "%{count}h"

View file

@ -48,6 +48,10 @@ Rails.application.routes.draw do
resources :media, only: [:show]
resources :tags, only: [:show]
# Remote follow
get :authorize_follow, to: 'authorize_follow#new'
post :authorize_follow, to: 'authorize_follow#create'
namespace :admin do
resources :pubsubhubbub, only: [:index]
resources :domain_blocks, only: [:index, :create]