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
This commit is contained in:
		@@ -66,7 +66,11 @@ const Status = React.createClass({
 | 
				
			|||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  handleFavouriteClick (status) {
 | 
					  handleFavouriteClick (status) {
 | 
				
			||||||
    this.props.dispatch(favourite(status));
 | 
					    if (status.get('favourited')) {
 | 
				
			||||||
 | 
					      this.props.dispatch(unfavourite(status));
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					      this.props.dispatch(favourite(status));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  handleReplyClick (status) {
 | 
					  handleReplyClick (status) {
 | 
				
			||||||
@@ -74,7 +78,11 @@ const Status = React.createClass({
 | 
				
			|||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  handleReblogClick (status) {
 | 
					  handleReblogClick (status) {
 | 
				
			||||||
    this.props.dispatch(reblog(status));
 | 
					    if (status.get('reblogged')) {
 | 
				
			||||||
 | 
					      this.props.dispatch(unreblog(status));
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					      this.props.dispatch(reblog(status));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  handleDeleteClick (status) {
 | 
					  handleDeleteClick (status) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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
 | 
				
			||||||
@@ -10,7 +10,7 @@
 | 
				
			|||||||
#
 | 
					#
 | 
				
			||||||
# It's strongly recommended that you check this file into your version control system.
 | 
					# 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
 | 
					  # These are extensions that must be enabled in order to support this database
 | 
				
			||||||
  enable_extension "plpgsql"
 | 
					  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
 | 
					    t.index ["user_id"], name: "index_web_settings_on_user_id", unique: true, using: :btree
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  add_foreign_key "statuses", "statuses", column: "reblog_of_id", on_delete: :cascade
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user