nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove some hardcoded diasporahq hax

Browse source
This commit is contained in:
Benjamin Neff 2015-05-17 01:27:39 +02:00 committed by Dennis Schubert
parent d2467319ed
commit 196e438286
2 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/workers/notify_local_users.rb
View file

@ -10,10 +10,6 @@ module Workers
object = object_klass.constantize.find_by_id(object_id) 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) users = User.where(:id => user_ids)
person = Person.find_by_id(person_id) person = Person.find_by_id(person_id)

11
lib/postzord/dispatcher.rb
View file

@ -66,8 +66,6 @@ class Postzord::Dispatcher
@object @object
end end
protected protected
# @return [Object] # @return [Object]
@ -170,14 +168,7 @@ class Postzord::Dispatcher
def notify_users(users) def notify_users(users)
return unless users.present? && @object.respond_to?(:persisted?) return unless users.present? && @object.respond_to?(:persisted?)
#temp hax Workers::NotifyLocalUsers.perform_async(users.map(&:id), @object.class.to_s, @object.id, @object.author.id)
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'))
end end
end end