nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Eugen Rochko 2017-02-17 02:33:10 +01:00
parent 5ddad41245
commit a1e96ae94f
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/components/features/status/index.jsx
View File

@ -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) {

5
db/migrate/20170217012631_add_reblog_of_id_foreign_key_to_statuses.rb Normal file
View File

@ -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

3
db/schema.rb
View File

@ -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