Fix newlines in accout notes added by the Move handler (#16415)
* Fix newlines in account notes added by the move handler * Make MoveWorker more robust
This commit is contained in:
		
							parent
							
								
									262c7bcb57
								
							
						
					
					
						commit
						1c21dcfa35
					
				@ -13,9 +13,13 @@ class MoveWorker
 | 
				
			|||||||
      queue_follow_unfollows!
 | 
					      queue_follow_unfollows!
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @deferred_error = nil
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    copy_account_notes!
 | 
					    copy_account_notes!
 | 
				
			||||||
    carry_blocks_over!
 | 
					    carry_blocks_over!
 | 
				
			||||||
    carry_mutes_over!
 | 
					    carry_mutes_over!
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    raise @deferred_error unless @deferred_error.nil?
 | 
				
			||||||
  rescue ActiveRecord::RecordNotFound
 | 
					  rescue ActiveRecord::RecordNotFound
 | 
				
			||||||
    true
 | 
					    true
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
@ -36,6 +40,8 @@ class MoveWorker
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    @source_account.followers.local.select(:id).find_in_batches do |accounts|
 | 
					    @source_account.followers.local.select(:id).find_in_batches do |accounts|
 | 
				
			||||||
      UnfollowFollowWorker.push_bulk(accounts.map(&:id)) { |follower_id| [follower_id, @source_account.id, @target_account.id, bypass_locked] }
 | 
					      UnfollowFollowWorker.push_bulk(accounts.map(&:id)) { |follower_id| [follower_id, @source_account.id, @target_account.id, bypass_locked] }
 | 
				
			||||||
 | 
					    rescue => e
 | 
				
			||||||
 | 
					      @deferred_error = e
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -47,10 +53,12 @@ class MoveWorker
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
      new_note = AccountNote.find_by(account: note.account, target_account: @target_account)
 | 
					      new_note = AccountNote.find_by(account: note.account, target_account: @target_account)
 | 
				
			||||||
      if new_note.nil?
 | 
					      if new_note.nil?
 | 
				
			||||||
        AccountNote.create!(account: note.account, target_account: @target_account, comment: [text, note.comment].join('\n'))
 | 
					        AccountNote.create!(account: note.account, target_account: @target_account, comment: [text, note.comment].join("\n"))
 | 
				
			||||||
      else
 | 
					      else
 | 
				
			||||||
        new_note.update!(comment: [text, note.comment, '\n', new_note.comment].join('\n'))
 | 
					        new_note.update!(comment: [text, note.comment, "\n", new_note.comment].join("\n"))
 | 
				
			||||||
      end
 | 
					      end
 | 
				
			||||||
 | 
					    rescue => e
 | 
				
			||||||
 | 
					      @deferred_error = e
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -60,6 +68,8 @@ class MoveWorker
 | 
				
			|||||||
        BlockService.new.call(block.account, @target_account)
 | 
					        BlockService.new.call(block.account, @target_account)
 | 
				
			||||||
        add_account_note_if_needed!(block.account, 'move_handler.carry_blocks_over_text')
 | 
					        add_account_note_if_needed!(block.account, 'move_handler.carry_blocks_over_text')
 | 
				
			||||||
      end
 | 
					      end
 | 
				
			||||||
 | 
					    rescue => e
 | 
				
			||||||
 | 
					      @deferred_error = e
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -67,6 +77,8 @@ class MoveWorker
 | 
				
			|||||||
    @source_account.muted_by_relationships.where(account: Account.local).find_each do |mute|
 | 
					    @source_account.muted_by_relationships.where(account: Account.local).find_each do |mute|
 | 
				
			||||||
      MuteService.new.call(mute.account, @target_account, notifications: mute.hide_notifications) unless mute.account.muting?(@target_account) || mute.account.following?(@target_account)
 | 
					      MuteService.new.call(mute.account, @target_account, notifications: mute.hide_notifications) unless mute.account.muting?(@target_account) || mute.account.following?(@target_account)
 | 
				
			||||||
      add_account_note_if_needed!(mute.account, 'move_handler.carry_mutes_over_text')
 | 
					      add_account_note_if_needed!(mute.account, 'move_handler.carry_mutes_over_text')
 | 
				
			||||||
 | 
					    rescue => e
 | 
				
			||||||
 | 
					      @deferred_error = e
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user