diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-09-09 14:28:08 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-09-09 14:28:08 -0500 |
| commit | 514fc908a373306b32b2b6b9fc0d849161d88271 (patch) | |
| tree | 0f0028e424b43dcf4a59b21ccc7170dfe883746b /app/models | |
| parent | b9f7bc149b2a6abfbdaee83e6992b617b8bdb18e (diff) | |
| parent | 11bddd31ce33b654ef72b00221715e6026486e7c (diff) | |
Merge tag 'v1.6.0rc3' into sync/upstream
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/status.rb | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index f44f79aaf..fdc230d8f 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -22,6 +22,7 @@ # reblogs_count :integer default(0), not null # language :string # conversation_id :integer +# local :boolean # class Status < ApplicationRecord @@ -84,7 +85,7 @@ class Status < ApplicationRecord end def local? - uri.nil? + attributes['local'] || uri.nil? end def reblog? @@ -131,11 +132,14 @@ class Status < ApplicationRecord !sensitive? && media_attachments.any? end + after_create :store_uri, if: :local? + before_validation :prepare_contents, if: :local? before_validation :set_reblog before_validation :set_visibility before_validation :set_conversation before_validation :set_sensitivity + before_validation :set_local class << self def not_in_filtered_languages(account) @@ -253,6 +257,10 @@ class Status < ApplicationRecord private + def store_uri + update_attribute(:uri, ActivityPub::TagManager.instance.uri_for(self)) if uri.nil? + end + def prepare_contents text&.strip! spoiler_text&.strip! @@ -292,4 +300,8 @@ class Status < ApplicationRecord thread.account_id end end + + def set_local + self.local = account.local? + end end |