From 196e4382868644e553735130ade800b3cf7170bc Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 17 May 2015 01:27:39 +0200
Subject: [PATCH] remove some hardcoded diasporahq hax
---
app/workers/notify_local_users.rb | 4 ----
lib/postzord/dispatcher.rb | 11 +----------
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/app/workers/notify_local_users.rb b/app/workers/notify_local_users.rb
index 1f62001148..39c797a9b6 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 ace9757529..8225397d3a 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
--
GitLab