tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tootsuite/master at 3023725936

Browse Source
This commit is contained in:
Surinna Curtis
2017-11-16 01:21:16 -06:00
parent 3023725936 88627fd7aa
commit 35fbdc36f9
230 changed files with 8548 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/follow_request.rb
View File

@ -5,9 +5,10 @@
#
# created_at :datetime not null
# updated_at :datetime not null
# account_id :bigint not null
# id :bigint not null, primary key
# target_account_id :bigint not null
# account_id :bigint not null
# id :bigint not null, primary key
# target_account_id :bigint not null
# show_reblogs :boolean default(TRUE), not null
#
class FollowRequest < ApplicationRecord
@ -21,7 +22,7 @@ class FollowRequest < ApplicationRecord
validates :account_id, uniqueness: { scope: :target_account_id }
def authorize!
account.follow!(target_account)
account.follow!(target_account, reblogs: show_reblogs)
MergeWorker.perform_async(target_account.id, account.id)
destroy!