erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Fix deleted pinned posts potentially counting towards the pinned posts limit (#19005)

Browse source 
Fixes #18938
This commit is contained in:
Claire 2022-10-05 00:16:40 +02:00 committed by GitHub
parent 02ba9cfa35
commit cedcece0cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/api/v1/statuses_controller.rb
View file

@ -77,6 +77,7 @@ class Api::V1::StatusesController < Api::BaseController
authorize @status, :destroy? authorize @status, :destroy?
@status.discard @status.discard
StatusPin.find_by(status: @status)&.destroy
@status.account.statuses_count = @status.account.statuses_count - 1 @status.account.statuses_count = @status.account.statuses_count - 1
json = render_to_body json: @status, serializer: REST::StatusSerializer, source_requested: true json = render_to_body json: @status, serializer: REST::StatusSerializer, source_requested: true

2
app/services/remove_status_service.rb
View file

@ -21,6 +21,8 @@ class RemoveStatusService < BaseService
with_lock("distribute:#{@status.id}") do with_lock("distribute:#{@status.id}") do
@status.discard @status.discard
StatusPin.find_by(status: @status)&.destroy
remove_from_self if @account.local? remove_from_self if @account.local?
remove_from_followers remove_from_followers
remove_from_lists remove_from_lists