From 288f1293ef6702fd55262ffa1a143e6a36d47d14 Mon Sep 17 00:00:00 2001
From: Erin <sylphofelectricity@gmail.com>
Date: Sun, 10 Dec 2017 21:39:27 -0600
Subject: set local_only in a before_create callback instead of status service

---
 app/models/status.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'app/models')

diff --git a/app/models/status.rb b/app/models/status.rb
index 9ae753447..94b2a1aa9 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -141,6 +141,8 @@ class Status < ApplicationRecord
 
   around_create Mastodon::Snowflake::Callbacks
 
+  before_create :set_locality
+
   before_validation :prepare_contents, if: :local?
   before_validation :set_reblog
   before_validation :set_visibility
@@ -302,6 +304,12 @@ class Status < ApplicationRecord
     self.sensitive = sensitive || spoiler_text.present?
   end
 
+  def set_locality
+    if account.domain.nil?
+      self.local_only = marked_local_only?
+    end
+  end
+
   def set_conversation
     self.reply = !(in_reply_to_id.nil? && thread.nil?) unless reply
 
-- 
cgit