Fix favourite handling in ProcessInteractionService

master
Eugen Rochko 9 years ago
parent 43bb8a25e7
commit da4b675aca
  1. 5
      app/controllers/auth/sessions_controller.rb
  2. 4
      app/models/user.rb
  3. 7
      app/services/process_feed_service.rb
  4. 2
      app/services/process_interaction_service.rb

@ -1,8 +1,3 @@
class Auth::SessionsController < Devise::SessionsController class Auth::SessionsController < Devise::SessionsController
layout 'auth' layout 'auth'
def create
params[:user].merge!(remember_me: 1)
super
end
end end

@ -11,4 +11,8 @@ class User < ActiveRecord::Base
def admin? def admin?
self.admin self.admin
end end
def remember_me
(super == nil) ? '1' : super
end
end end

@ -61,6 +61,9 @@ class ProcessFeedService < BaseService
end end
else else
# What to do about remote user? # 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 end
end end
@ -176,8 +179,4 @@ class ProcessFeedService < BaseService
def update_remote_profile_service def update_remote_profile_service
@update_remote_profile_service ||= UpdateRemoteProfileService.new @update_remote_profile_service ||= UpdateRemoteProfileService.new
end end
def fan_out_on_write_service
@fan_out_on_write_service ||= FanOutOnWriteService.new
end
end end

@ -77,7 +77,7 @@ class ProcessInteractionService < BaseService
end end
def activity_id(xml) def activity_id(xml)
xml.at_xpath('./activity:object/xmlns:id').content xml.at_xpath('//activity:object/xmlns:id').content
end end
def salmon def salmon

Loading…
Cancel
Save