Resolve issue with rendering authorize/reject Salmon slaps
This commit is contained in:
		
							parent
							
								
									31c633e528
								
							
						
					
					
						commit
						94d2182717
					
				| 
						 | 
					@ -30,8 +30,12 @@ module Streamable
 | 
				
			||||||
      false
 | 
					      false
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    def needs_stream_entry?
 | 
				
			||||||
 | 
					      account.local?
 | 
				
			||||||
 | 
					    end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    after_create do
 | 
					    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
 | 
					  end
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -45,6 +45,10 @@ class FollowRequest < ApplicationRecord
 | 
				
			||||||
    true
 | 
					    true
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  def needs_stream_entry?
 | 
				
			||||||
 | 
					    true
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def title
 | 
					  def title
 | 
				
			||||||
    if destroyed?
 | 
					    if destroyed?
 | 
				
			||||||
      case @verb
 | 
					      case @verb
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,5 +7,6 @@ class AuthorizeFollowService < BaseService
 | 
				
			||||||
    follow_request = FollowRequest.find_by!(account: source_account, target_account: target_account)
 | 
					    follow_request = FollowRequest.find_by!(account: source_account, target_account: target_account)
 | 
				
			||||||
    follow_request.authorize!
 | 
					    follow_request.authorize!
 | 
				
			||||||
    NotificationWorker.perform_async(stream_entry_to_xml(follow_request.stream_entry), target_account.id, source_account.id) unless source_account.local?
 | 
					    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
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,5 +7,6 @@ class RejectFollowService < BaseService
 | 
				
			||||||
    follow_request = FollowRequest.find_by!(account: source_account, target_account: target_account)
 | 
					    follow_request = FollowRequest.find_by!(account: source_account, target_account: target_account)
 | 
				
			||||||
    follow_request.reject!
 | 
					    follow_request.reject!
 | 
				
			||||||
    NotificationWorker.perform_async(stream_entry_to_xml(follow_request.stream_entry), target_account.id, source_account.id) unless source_account.local?
 | 
					    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
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue