Fix favourite handling in ProcessInteractionService

diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index f02ce00c133f84f2a8ccb67544bcb29f2aa85af9..42b1d4ead2e35a6ff495741ff0023d3908b29fcb 100644 (file)
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -1,8 +1,3 @@
 class Auth::SessionsController < Devise::SessionsController
   layout 'auth'
-
-  def create
-    params[:user].merge!(remember_me: 1)
-    super
-  end
 end

diff --git a/app/models/user.rb b/app/models/user.rb
index a80efb50d195ad84869d916ac904fc8cf69f755b..8b2cd22e067d37ea808b764509c0b5b0b8c4147d 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -11,4 +11,8 @@ class User < ActiveRecord::Base
   def admin?
     self.admin
   end
+
+  def remember_me
+    (super == nil) ? '1' : super
+  end
 end

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 047d0e7475d9466fa866270c7efde604da05934a..ba11fc4b1f20804519dc84a1112584b4c86f777e 100644 (file)
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -61,6 +61,9 @@ class ProcessFeedService < BaseService
         end
       else
         # What to do about remote user?
+        # Are we supposed to do a search in the database by URL?
+        # We could technically open the URL, look for LRDD tags, get webfinger that way,
+        # finally acquire the acct:username@domain form, and then check DB
       end
     end
   end
@@ -176,8 +179,4 @@ class ProcessFeedService < BaseService
   def update_remote_profile_service
     @update_remote_profile_service ||= UpdateRemoteProfileService.new
   end
-
-  def fan_out_on_write_service
-    @fan_out_on_write_service ||= FanOutOnWriteService.new
-  end
 end

diff --git a/app/services/process_interaction_service.rb b/app/services/process_interaction_service.rb
index fd27d667f139cb419157476c6227e94f75b9b88d..b7503ca6ad08738c1c311b5b6c3636d4e5c1ee66 100644 (file)
--- a/app/services/process_interaction_service.rb
+++ b/app/services/process_interaction_service.rb
@@ -77,7 +77,7 @@ class ProcessInteractionService < BaseService
   end
 
   def activity_id(xml)
-    xml.at_xpath('./activity:object/xmlns:id').content
+    xml.at_xpath('//activity:object/xmlns:id').content
   end
 
   def salmon