From da4b675aca2c68e976d7920d3fc5b7e2881d1d86 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 26 Mar 2016 01:34:12 +0100
Subject: [PATCH] Fix favourite handling in ProcessInteractionService

---
 app/controllers/auth/sessions_controller.rb | 5 -----
 app/models/user.rb                          | 4 ++++
 app/services/process_feed_service.rb        | 7 +++----
 app/services/process_interaction_service.rb | 2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index f02ce00c13..42b1d4ead2 100644
--- 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 a80efb50d1..8b2cd22e06 100644
--- 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 047d0e7475..ba11fc4b1f 100644
--- 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 fd27d667f1..b7503ca6ad 100644
--- 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