logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 909d81923ef9fd61d4435d9f638732ccb9e8aa30
parent: 2edeb3fe1c6212380a1c053f124fbaed1c47a261
Author: Eugen <eugen@zeonfederated.com>
Date:   Wed,  5 Apr 2017 02:54:03 +0200

Merge pull request #898 from SirCmpwn/remote-follow-improvements

Remote follow improvements

Diffstat:

Mapp/controllers/remote_follow_controller.rb3+++
1 file changed, 3 insertions(+), 0 deletions(-)

diff --git a/app/controllers/remote_follow_controller.rb b/app/controllers/remote_follow_controller.rb @@ -8,6 +8,7 @@ class RemoteFollowController < ApplicationController def new @remote_follow = RemoteFollow.new + @remote_follow.acct = session[:remote_follow] if session.key?(:remote_follow) end def create @@ -22,6 +23,8 @@ class RemoteFollowController < ApplicationController render(:new) && return end + session[:remote_follow] = @remote_follow.acct + redirect_to Addressable::Template.new(redirect_url_link.template).expand(uri: "#{@account.username}@#{Rails.configuration.x.local_domain}").to_s else render :new