Fix server error when failing to follow back followers from /relationships (#23787)
		
	This commit is contained in:
		
					parent
					
						
							
								348599a543
							
						
					
				
			
			
				commit
				
					
						c22c4247d9
					
				
			
		
					 3 changed files with 9 additions and 0 deletions
				
			
		|  | @ -19,6 +19,8 @@ class RelationshipsController < ApplicationController | |||
|     @form.save | ||||
|   rescue ActionController::ParameterMissing | ||||
|     # Do nothing | ||||
|   rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound | ||||
|     flash[:alert] = I18n.t('relationships.follow_failure') if action_from_button == 'follow' | ||||
|   ensure | ||||
|     redirect_to relationships_path(filter_params) | ||||
|   end | ||||
|  |  | |||
|  | @ -35,9 +35,15 @@ class Form::AccountBatch | |||
|   private | ||||
| 
 | ||||
|   def follow! | ||||
|     error = nil | ||||
| 
 | ||||
|     accounts.each do |target_account| | ||||
|       FollowService.new.call(current_account, target_account) | ||||
|     rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound => e | ||||
|       error ||= e | ||||
|     end | ||||
| 
 | ||||
|     raise error if error.present? | ||||
|   end | ||||
| 
 | ||||
|   def unfollow! | ||||
|  |  | |||
|  | @ -1341,6 +1341,7 @@ en: | |||
|   relationships: | ||||
|     activity: Account activity | ||||
|     dormant: Dormant | ||||
|     follow_failure: Could not follow some of the selected accounts. | ||||
|     follow_selected_followers: Follow selected followers | ||||
|     followers: Followers | ||||
|     following: Following | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue