Merge branch 'feature/worker-updates' into 'develop'

Some worker updates.

See merge request gab/social/gab-social!59

app/services/remove_status_service.rb

@@ -7,21 +7,12 @@ class RemoveStatusService < BaseService
     @payload      = Oj.dump(event: :delete, payload: status.id.to_s)
     @status       = status
     @account      = status.account
-    @tags         = status.tags.pluck(:name).to_a
-    @mentions     = status.active_mentions.includes(:account).to_a
     @reblogs      = status.reblogs.includes(:account).to_a
     @options      = options
 
     RedisLock.acquire(lock_options) do |lock|
       if lock.acquired?
-        remove_from_self if status.account.local?
-        remove_from_followers
-        remove_from_lists
-        remove_from_affected
         remove_reblogs
-        remove_from_hashtags
-        remove_from_pro
-
         @status.destroy!
       else
         raise GabSocial::RaceConditionError
@@ -38,30 +29,6 @@ class RemoveStatusService < BaseService
 
   private
 
-  def remove_from_self
-    FeedManager.instance.unpush_from_home(@account, @status)
-  end
-
-  def remove_from_followers
-    @account.followers_for_local_distribution.reorder(nil).find_each do |follower|
-      FeedManager.instance.unpush_from_home(follower, @status)
-    end
-  end
-
-  def remove_from_lists
-    @account.lists_for_local_distribution.select(:id, :account_id).reorder(nil).find_each do |list|
-      FeedManager.instance.unpush_from_list(list, @status)
-    end
-  end
-
-  def remove_from_affected
-    redis.with do |conn|
-      @mentions.map(&:account).select(&:local?).each do |account|
-        conn.publish("timeline:#{account.id}", @payload)
-      end
-    end
-  end
-
   def remove_reblogs
     # We delete reblogs of the status before the original status,
     # because once original status is gone, reblogs will disappear
@@ -72,25 +39,6 @@ class RemoveStatusService < BaseService
     end
   end
 
-  def remove_from_hashtags
-    return unless @status.public_visibility?
-
-    redis.with do |conn|
-      @tags.each do |hashtag|
-        conn.publish("timeline:hashtag:#{hashtag}", @payload)
-        conn.publish("timeline:hashtag:#{hashtag}:local", @payload) if @status.local?
-      end
-    end
-  end
-
-  def remove_from_pro
-    redis.with do |conn|
-      if @account.is_pro || @account.is_donor || @account.is_investor || @account.is_verified
-        conn.publish('timeline:pro', @payload)
-      end
-    end
-  end
-
   def lock_options
     { redis: Redis.current, key: "distribute:#{@status.id}" }
   end

app/workers/local_notification_worker.rb

@@ -3,6 +3,8 @@
 class LocalNotificationWorker
   include Sidekiq::Worker
 
+  sidekiq_options queue: 'default', retry: 3
+
   def perform(receiver_account_id, activity_id = nil, activity_class_name = nil)
     return true if activity_id.nil? or activity_class_name.nil?
 

app/workers/mute_worker.rb

@@ -4,9 +4,9 @@ class MuteWorker
   include Sidekiq::Worker
 
   def perform(account_id, target_account_id)
-    FeedManager.instance.clear_from_timeline(
+    #FeedManager.instance.clear_from_timeline(
-      Account.find(account_id),
+    #  Account.find(account_id),
-      Account.find(target_account_id)
+    #  Account.find(target_account_id)
-    )
+    #)
   end
 end

app/workers/unmerge_worker.rb

@@ -6,6 +6,6 @@ class UnmergeWorker
   sidekiq_options queue: 'pull'
 
   def perform(from_account_id, into_account_id)
-    FeedManager.instance.unmerge_from_timeline(Account.find(from_account_id), Account.find(into_account_id))
+    # FeedManager.instance.unmerge_from_timeline(Account.find(from_account_id), Account.find(into_account_id))
   end
 end