about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-05 02:54:03 +0200
committerGitHub <noreply@github.com>2017-04-05 02:54:03 +0200
commit909d81923ef9fd61d4435d9f638732ccb9e8aa30 (patch)
tree678d08284c1a2a4b30d435065dcd5ece0fb86272
parent2edeb3fe1c6212380a1c053f124fbaed1c47a261 (diff)
parentf7e35d90db3a08dbb4e4104f513e5817e18659b9 (diff)
Merge pull request #898 from SirCmpwn/remote-follow-improvements
Remote follow improvements
-rw-r--r--app/controllers/remote_follow_controller.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/remote_follow_controller.rb b/app/controllers/remote_follow_controller.rb
index 7d4bfe6ce..1e3f786ec 100644
--- 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