Resolve issue with rendering authorize/reject Salmon slaps

master
Eugen Rochko 8 years ago
parent 31c633e528
commit 94d2182717
  1. 6
      app/models/concerns/streamable.rb
  2. 4
      app/models/follow_request.rb
  3. 1
      app/services/authorize_follow_service.rb
  4. 1
      app/services/reject_follow_service.rb

@ -30,8 +30,12 @@ module Streamable
false
end
def needs_stream_entry?
account.local?
end
after_create do
account.stream_entries.create!(activity: self, hidden: hidden?) if account.local?
account.stream_entries.create!(activity: self, hidden: hidden?) if needs_stream_entry?
end
end
end

@ -45,6 +45,10 @@ class FollowRequest < ApplicationRecord
true
end
def needs_stream_entry?
true
end
def title
if destroyed?
case @verb

@ -7,5 +7,6 @@ class AuthorizeFollowService < BaseService
follow_request = FollowRequest.find_by!(account: source_account, target_account: target_account)
follow_request.authorize!
NotificationWorker.perform_async(stream_entry_to_xml(follow_request.stream_entry), target_account.id, source_account.id) unless source_account.local?
follow_request.stream_entry.destroy
end
end

@ -7,5 +7,6 @@ class RejectFollowService < BaseService
follow_request = FollowRequest.find_by!(account: source_account, target_account: target_account)
follow_request.reject!
NotificationWorker.perform_async(stream_entry_to_xml(follow_request.stream_entry), target_account.id, source_account.id) unless source_account.local?
follow_request.stream_entry.destroy
end
end

Loading…
Cancel
Save