luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-26 00:34:01 +00:00
Code Issues Projects Releases Wiki Activity

Add follow selected followers button (#15148)

Browse source 
* Add follow selected followers button

* Fix unused variable

* Fix i18n normalize
This commit is contained in:
Takeshi Umeda 2020-11-13 00:58:00 +09:00 committed by GitHub
parent 4790a126be
commit 2b1a6e734f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/relationships_controller.rb
View file

@ -49,7 +49,9 @@ class RelationshipsController < ApplicationController
end
def action_from_button
if params[:unfollow]
if params[:follow]
'follow'
elsif params[:unfollow]
'unfollow'
elsif params[:remove_from_followers]
'remove_from_followers'

8
app/models/form/account_batch.rb
View file

@ -9,6 +9,8 @@ class Form::AccountBatch
def save
case action
when 'follow'
follow!
when 'unfollow'
unfollow!
when 'remove_from_followers'
@ -24,6 +26,12 @@ class Form::AccountBatch
private
def follow!
accounts.find_each do |target_account|
FollowService.new.call(current_account, target_account)
end
end
def unfollow!
accounts.find_each do |target_account|
UnfollowService.new.call(current_account, target_account)

2
app/views/relationships/show.html.haml
View file

@ -42,6 +42,8 @@
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
= f.button safe_join([fa_icon('user-plus'), t('relationships.follow_selected_followers')]), name: :follow, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } if followed_by_relationship? && !mutual_relationship?
= f.button safe_join([fa_icon('user-times'), t('relationships.remove_selected_follows')]), name: :unfollow, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } unless followed_by_relationship?
= f.button safe_join([fa_icon('trash'), t('relationships.remove_selected_followers')]), name: :remove_from_followers, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } unless following_relationship?

1
config/locales/en.yml
View file

@ -1075,6 +1075,7 @@ en:
relationships:
activity: Account activity
dormant: Dormant
follow_selected_followers: Follow selected followers
followers: Followers
following: Following
invited: Invited