luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-21 12:47:58 +00:00
Code Issues Projects Releases Wiki Activity

set local_only in a before_create callback instead of status service

Browse source
This commit is contained in:
Erin 2017-12-10 21:39:27 -06:00
parent 0c46058a43
commit 288f1293ef
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/status.rb
View file

@ -141,6 +141,8 @@ class Status < ApplicationRecord
around_create Mastodon::Snowflake::Callbacks around_create Mastodon::Snowflake::Callbacks
before_create :set_locality
before_validation :prepare_contents, if: :local? before_validation :prepare_contents, if: :local?
before_validation :set_reblog before_validation :set_reblog
before_validation :set_visibility before_validation :set_visibility
@ -302,6 +304,12 @@ class Status < ApplicationRecord
self.sensitive = sensitive || spoiler_text.present? self.sensitive = sensitive || spoiler_text.present?
end end
def set_locality
if account.domain.nil?
self.local_only = marked_local_only?
end
end
def set_conversation def set_conversation
self.reply = !(in_reply_to_id.nil? && thread.nil?) unless reply self.reply = !(in_reply_to_id.nil? && thread.nil?) unless reply

3
app/services/post_status_service.rb
View file

@ -40,9 +40,6 @@ class PostStatusService < BaseService
LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text? LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text?
DistributionWorker.perform_async(status.id) DistributionWorker.perform_async(status.id)
status.local_only = status.marked_local_only?
status.save!
unless status.local_only unless status.local_only
Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id) Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id)
ActivityPub::DistributionWorker.perform_async(status.id) ActivityPub::DistributionWorker.perform_async(status.id)