From 3114e55c7a1e1640ed408986ccf3a63267a2653e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 2 Dec 2016 14:33:20 +0100
Subject: Fix #323 - self-replies to appear in public timelines again

---
 ...202132159_add_in_reply_to_account_id_to_statuses.rb | 18 ++++++++++++++++++
 db/schema.rb                                           | 15 ++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 db/migrate/20161202132159_add_in_reply_to_account_id_to_statuses.rb

(limited to 'db')

diff --git a/db/migrate/20161202132159_add_in_reply_to_account_id_to_statuses.rb b/db/migrate/20161202132159_add_in_reply_to_account_id_to_statuses.rb
new file mode 100644
index 000000000..f93bc6565
--- /dev/null
+++ b/db/migrate/20161202132159_add_in_reply_to_account_id_to_statuses.rb
@@ -0,0 +1,18 @@
+class AddInReplyToAccountIdToStatuses < ActiveRecord::Migration[5.0]
+  def up
+    add_column :statuses, :in_reply_to_account_id, :integer, null: true, default: nil
+
+    ActiveRecord::Base.transaction do
+      Status.where.not(in_reply_to_id: nil).includes(:thread).find_each do |status|
+        next if status.thread.nil?
+
+        status.in_reply_to_account_id = status.thread.account_id
+        status.save!
+      end
+    end
+  end
+
+  def down
+    remove_column :statuses, :in_reply_to_account_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7da83914c..f9080ae2d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161130185319) do
+ActiveRecord::Schema.define(version: 20161202132159) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -168,15 +168,16 @@ ActiveRecord::Schema.define(version: 20161130185319) do
 
   create_table "statuses", force: :cascade do |t|
     t.string   "uri"
-    t.integer  "account_id",                     null: false
-    t.text     "text",           default: "",    null: false
-    t.datetime "created_at",                     null: false
-    t.datetime "updated_at",                     null: false
+    t.integer  "account_id",                             null: false
+    t.text     "text",                   default: "",    null: false
+    t.datetime "created_at",                             null: false
+    t.datetime "updated_at",                             null: false
     t.integer  "in_reply_to_id"
     t.integer  "reblog_of_id"
     t.string   "url"
-    t.boolean  "sensitive",      default: false
-    t.integer  "visibility",     default: 0,     null: false
+    t.boolean  "sensitive",              default: false
+    t.integer  "visibility",             default: 0,     null: false
+    t.integer  "in_reply_to_account_id"
     t.index ["account_id"], name: "index_statuses_on_account_id", using: :btree
     t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id", using: :btree
     t.index ["reblog_of_id"], name: "index_statuses_on_reblog_of_id", using: :btree
-- 
cgit