diff --git a/app/models/jobs/notify_local_users.rb b/app/models/jobs/notify_local_users.rb index a79e88acf..f75d5418e 100644 --- a/app/models/jobs/notify_local_users.rb +++ b/app/models/jobs/notify_local_users.rb @@ -9,8 +9,14 @@ module Jobs require File.join(Rails.root, 'app/models/notification') def self.perform(user_ids, object_klass, object_id, person_id) - users = User.where(:id => user_ids) + 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) users.each{|user| Notification.notify(user, object, person) }