From d6f37c6ae01c57164a69c6b7e4934d844a0c2a3a Mon Sep 17 00:00:00 2001
From: multiple creatures <dev@multiple-creature.party>
Date: Tue, 21 May 2019 01:58:07 -0500
Subject: handle importing posts from json dumps

---
 app/models/import.rb | 4 ++--
 app/models/status.rb | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/import.rb b/app/models/import.rb
index a7a0d8065..a6dc30549 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -17,14 +17,14 @@
 #
 
 class Import < ApplicationRecord
-  FILE_TYPES = %w(text/plain text/csv).freeze
+  FILE_TYPES = %w(text/plain text/html text/csv application/json application/json+ld).freeze
   MODES = %i(merge overwrite).freeze
 
   self.inheritance_column = false
 
   belongs_to :account
 
-  enum type: [:following, :blocking, :muting, :domain_blocking]
+  enum type: [:following, :blocking, :muting, :domain_blocking, :statuses]
 
   validates :type, presence: true
 
diff --git a/app/models/status.rb b/app/models/status.rb
index 5f25e86f6..9095c3688 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -29,6 +29,9 @@
 #  network                :boolean          default(FALSE), not null
 #  content_type           :string
 #  footer                 :text
+#  edited                 :boolean
+#  imported               :boolean
+#  origin                 :string
 #
 
 class Status < ApplicationRecord
-- 
cgit