Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
d010816b
Unverified
Commit
d010816b
authored
6 years ago
by
Eugen Rochko
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix error when trying to update counters for statuses that are gone (#8251)
parent
78fa926e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/models/favourite.rb
+2
-2
2 additions, 2 deletions
app/models/favourite.rb
app/models/status.rb
+6
-4
6 additions, 4 deletions
app/models/status.rb
spec/models/status_spec.rb
+21
-0
21 additions, 0 deletions
spec/models/status_spec.rb
with
29 additions
and
6 deletions
app/models/favourite.rb
+
2
−
2
View file @
d010816b
...
...
@@ -32,11 +32,11 @@ class Favourite < ApplicationRecord
private
def
increment_cache_counters
status
.
increment_count!
(
:favourites_count
)
status
&
.
increment_count!
(
:favourites_count
)
end
def
decrement_cache_counters
return
if
association
(
:status
).
loaded?
&&
(
status
.
marked_for_destruction?
||
status
.
marked_for_mass_destruction?
)
status
.
decrement_count!
(
:favourites_count
)
status
&
.
decrement_count!
(
:favourites_count
)
end
end
This diff is collapsed.
Click to expand it.
app/models/status.rb
+
6
−
4
View file @
d010816b
...
...
@@ -396,6 +396,8 @@ class Status < ApplicationRecord
private
def
update_status_stat!
(
attrs
)
return
if
marked_for_destruction?
||
destroyed?
record
=
status_stat
||
build_status_stat
record
.
update
(
attrs
)
end
...
...
@@ -456,8 +458,8 @@ class Status < ApplicationRecord
Account
.
where
(
id:
account_id
).
update_all
(
'statuses_count = COALESCE(statuses_count, 0) + 1'
)
end
reblog
.
increment_count!
(
:reblogs_count
)
if
reblog?
thread
.
increment_count!
(
:replies_count
)
if
in_reply_to_id
.
present?
&&
(
public_visibility?
||
unlisted_visibility?
)
reblog
&
.
increment_count!
(
:reblogs_count
)
if
reblog?
thread
&
.
increment_count!
(
:replies_count
)
if
in_reply_to_id
.
present?
&&
(
public_visibility?
||
unlisted_visibility?
)
end
def
decrement_counter_caches
...
...
@@ -469,7 +471,7 @@ class Status < ApplicationRecord
Account
.
where
(
id:
account_id
).
update_all
(
'statuses_count = GREATEST(COALESCE(statuses_count, 0) - 1, 0)'
)
end
reblog
.
decrement_count!
(
:reblogs_count
)
if
reblog?
thread
.
decrement_count!
(
:replies_count
)
if
in_reply_to_id
.
present?
&&
(
public_visibility?
||
unlisted_visibility?
)
reblog
&
.
decrement_count!
(
:reblogs_count
)
if
reblog?
thread
&
.
decrement_count!
(
:replies_count
)
if
in_reply_to_id
.
present?
&&
(
public_visibility?
||
unlisted_visibility?
)
end
end
This diff is collapsed.
Click to expand it.
spec/models/status_spec.rb
+
21
−
0
View file @
d010816b
...
...
@@ -182,6 +182,27 @@ RSpec.describe Status, type: :model do
reblog
.
destroy
expect
(
subject
.
reblogs_count
).
to
eq
0
end
it
'does not fail when original is deleted before reblog'
do
reblog
=
Fabricate
(
:status
,
account:
bob
,
reblog:
subject
)
expect
(
subject
.
reblogs_count
).
to
eq
1
expect
{
subject
.
destroy
}.
to_not
raise_error
expect
(
Status
.
find_by
(
id:
reblog
.
id
)).
to
be_nil
end
end
describe
'#replies_count'
do
it
'is the number of replies'
do
reply
=
Fabricate
(
:status
,
account:
bob
,
thread:
subject
)
expect
(
subject
.
replies_count
).
to
eq
1
end
it
'is decremented when reply is removed'
do
reply
=
Fabricate
(
:status
,
account:
bob
,
thread:
subject
)
expect
(
subject
.
replies_count
).
to
eq
1
reply
.
destroy
expect
(
subject
.
replies_count
).
to
eq
0
end
end
describe
'#favourites_count'
do
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment