autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge tag 'v3.2.0' into hometown-dev

Browse Source
This commit is contained in:
Darius Kazemi
2020-08-11 13:56:04 -07:00
parent 65dc8812c9 93dd413a47
commit 52cb64a183
676 changed files with 20548 additions and 6954 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/services/process_mentions_service.rb
+3 -2
View File
@@ -36,7 +36,8 @@ class ProcessMentionsService < BaseService
next match if mention_undeliverable?(mentioned_account) || mentioned_account&.suspended?
mentions << mentioned_account.mentions.where(status: status).first_or_create(status: status)
mention = mentioned_account.mentions.new(status: status)
mentions << mention if mention.save
"@#{mentioned_account.acct}"
end
@@ -65,7 +66,7 @@ class ProcessMentionsService < BaseService
def activitypub_json
return @activitypub_json if defined?(@activitypub_json)
@activitypub_json = Oj.dump(serialize_payload(@status, ActivityPub::ActivitySerializer, signer: @status.account))
@activitypub_json = Oj.dump(serialize_payload(ActivityPub::ActivityPresenter.from_status(@status), ActivityPub::ActivitySerializer, signer: @status.account))
end
def resolve_account_service