diff --git a/app/workers/notify_local_users.rb b/app/workers/notify_local_users.rb index 1f6200114891f930be91d1dc3d8baf88497bb464..39c797a9b617bf2b2ba69274c01cd54e6378caec 100644 --- a/app/workers/notify_local_users.rb +++ b/app/workers/notify_local_users.rb @@ -10,10 +10,6 @@ module Workers object = object_klass.constantize.find_by_id(object_id) - #hax - return if (object.author.diaspora_handle == 'diasporahq@joindiaspora.com' || (object.respond_to?(:relayable?) && object.parent.author.diaspora_handle == 'diasporahq@joindiaspora.com')) - #end hax - users = User.where(:id => user_ids) person = Person.find_by_id(person_id) diff --git a/lib/postzord/dispatcher.rb b/lib/postzord/dispatcher.rb index ace9757529dc3df252890f56d18c8be2152c2e67..8225397d3a9919192d8747a4f4f1072e6da38934 100644 --- a/lib/postzord/dispatcher.rb +++ b/lib/postzord/dispatcher.rb @@ -66,8 +66,6 @@ class Postzord::Dispatcher @object end - - protected # @return [Object] @@ -170,14 +168,7 @@ class Postzord::Dispatcher def notify_users(users) return unless users.present? && @object.respond_to?(:persisted?) - #temp hax - unless object_is_related_to_diaspora_hq? - Workers::NotifyLocalUsers.perform_async(users.map{|u| u.id}, @object.class.to_s, @object.id, @object.author.id) - end - end - - def object_is_related_to_diaspora_hq? - (@object.author.diaspora_handle == 'diasporahq@joindiaspora.com' || (@object.respond_to?(:relayable?) && @object.parent.author.diaspora_handle == 'diasporahq@joindiaspora.com')) + Workers::NotifyLocalUsers.perform_async(users.map(&:id), @object.class.to_s, @object.id, @object.author.id) end end