mastofe

commit: a1e96ae94fbdad5b5953edd705717de4e1ce60eb
parent: 5ddad41245098f1ab931f732f8b48655a86d57b0
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Fri, 17 Feb 2017 02:33:10 +0100

Add foreign key to prevent reblogs of non-existent (after race conditions) statuses from happening
Fix issue with detailed status view not supporting unreblogging/unfavouriting

Diffstat:
M
app/assets/javascripts/components/features/status/index.jsx
12
++++++++++--
A
db/migrate/20170217012631_add_reblog_of_id_foreign_key_to_statuses.rb
5
+++++
M
db/schema.rb
3
++-

3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/app/assets/javascripts/components/features/status/index.jsx b/app/assets/javascripts/components/features/status/index.jsx
@@ -66,7 +66,11 @@ const Status = React.createClass({
   },
 
   handleFavouriteClick (status) {
-    this.props.dispatch(favourite(status));
+    if (status.get('favourited')) {
+      this.props.dispatch(unfavourite(status));
+    } else {
+      this.props.dispatch(favourite(status));
+    }
   },
 
   handleReplyClick (status) {
@@ -74,7 +78,11 @@ const Status = React.createClass({
   },
 
   handleReblogClick (status) {
-    this.props.dispatch(reblog(status));
+    if (status.get('reblogged')) {
+      this.props.dispatch(unreblog(status));
+    } else {
+      this.props.dispatch(reblog(status));
+    }
   },
 
   handleDeleteClick (status) {
diff --git a/db/migrate/20170217012631_add_reblog_of_id_foreign_key_to_statuses.rb b/db/migrate/20170217012631_add_reblog_of_id_foreign_key_to_statuses.rb
@@ -0,0 +1,5 @@
+class AddReblogOfIdForeignKeyToStatuses < ActiveRecord::Migration[5.0]
+  def change
+    add_foreign_key :statuses, :statuses, column: :reblog_of_id, on_delete: :cascade
+  end
+end
diff --git 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: 20170214110202) do
+ActiveRecord::Schema.define(version: 20170217012631) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -289,4 +289,5 @@ ActiveRecord::Schema.define(version: 20170214110202) do
     t.index ["user_id"], name: "index_web_settings_on_user_id", unique: true, using: :btree
   end
 
+  add_foreign_key "statuses", "statuses", column: "reblog_of_id", on_delete: :cascade
 end