Fix count numbers from ActivityPub not being saved (#4899)

They are marked as read-only by Rails, but we know what we are doing,
so we are un-marking them as such.

The mastodon:maintenance:update_counter_caches task is not really
supposed to be run anymore (it was a one-time thing during an upgrade)
however, just in case, I have modified it to not touch ActivityPub
accounts.

Also, no point writing to logger from these rake tasks, since they
are not to be run from cron. Better to give stdout feedback.
This commit is contained in:
Eugen Rochko 2017-09-12 00:16:03 +02:00 committed by GitHub
parent 0ef9d45d05
commit 0a6b098668
2 changed files with 12 additions and 8 deletions

View file

@ -172,6 +172,10 @@ class Account < ApplicationRecord
end end
class << self class << self
def readonly_attributes
super - %w(statuses_count following_count followers_count)
end
def domains def domains
reorder(nil).pluck('distinct accounts.domain') reorder(nil).pluck('distinct accounts.domain')
end end

View file

@ -90,9 +90,9 @@ namespace :mastodon do
desc 'Set unknown attachment type for remote-only attachments' desc 'Set unknown attachment type for remote-only attachments'
task set_unknown: :environment do task set_unknown: :environment do
Rails.logger.debug 'Setting unknown attachment type for remote-only attachments...' puts 'Setting unknown attachment type for remote-only attachments...'
MediaAttachment.where(file_file_name: nil).where.not(type: :unknown).in_batches.update_all(type: :unknown) MediaAttachment.where(file_file_name: nil).where.not(type: :unknown).in_batches.update_all(type: :unknown)
Rails.logger.debug 'Done!' puts 'Done!'
end end
desc 'Redownload avatars/headers of remote users. Optionally limit to a particular domain with DOMAIN' desc 'Redownload avatars/headers of remote users. Optionally limit to a particular domain with DOMAIN'
@ -188,24 +188,24 @@ namespace :mastodon do
namespace :maintenance do namespace :maintenance do
desc 'Update counter caches' desc 'Update counter caches'
task update_counter_caches: :environment do task update_counter_caches: :environment do
Rails.logger.debug 'Updating counter caches for accounts...' puts 'Updating counter caches for accounts...'
Account.unscoped.select('id').find_in_batches do |batch| Account.unscoped.where.not(protocol: :activitypub).select('id').find_in_batches do |batch|
Account.where(id: batch.map(&:id)).update_all('statuses_count = (select count(*) from statuses where account_id = accounts.id), followers_count = (select count(*) from follows where target_account_id = accounts.id), following_count = (select count(*) from follows where account_id = accounts.id)') Account.where(id: batch.map(&:id)).update_all('statuses_count = (select count(*) from statuses where account_id = accounts.id), followers_count = (select count(*) from follows where target_account_id = accounts.id), following_count = (select count(*) from follows where account_id = accounts.id)')
end end
Rails.logger.debug 'Updating counter caches for statuses...' puts 'Updating counter caches for statuses...'
Status.unscoped.select('id').find_in_batches do |batch| Status.unscoped.select('id').find_in_batches do |batch|
Status.where(id: batch.map(&:id)).update_all('favourites_count = (select count(*) from favourites where favourites.status_id = statuses.id), reblogs_count = (select count(*) from statuses as reblogs where reblogs.reblog_of_id = statuses.id)') Status.where(id: batch.map(&:id)).update_all('favourites_count = (select count(*) from favourites where favourites.status_id = statuses.id), reblogs_count = (select count(*) from statuses as reblogs where reblogs.reblog_of_id = statuses.id)')
end end
Rails.logger.debug 'Done!' puts 'Done!'
end end
desc 'Generate static versions of GIF avatars/headers' desc 'Generate static versions of GIF avatars/headers'
task add_static_avatars: :environment do task add_static_avatars: :environment do
Rails.logger.debug 'Generating static avatars/headers for GIF ones...' puts 'Generating static avatars/headers for GIF ones...'
Account.unscoped.where(avatar_content_type: 'image/gif').or(Account.unscoped.where(header_content_type: 'image/gif')).find_each do |account| Account.unscoped.where(avatar_content_type: 'image/gif').or(Account.unscoped.where(header_content_type: 'image/gif')).find_each do |account|
begin begin
@ -217,7 +217,7 @@ namespace :mastodon do
end end
end end
Rails.logger.debug 'Done!' puts 'Done!'
end end
desc 'Ensure referencial integrity' desc 'Ensure referencial integrity'