DG MS; activate dispatcher switch in Dispatcher; remove diasporahq blocker

This commit is contained in:
danielgrippi 2011-09-15 15:36:40 -07:00 committed by Ilya Zhitomirskiy
parent 0a9dc2ee5d
commit 58abbcc058
2 changed files with 5 additions and 7 deletions

View file

@ -13,8 +13,6 @@ module Jobs
MAX_RETRIES = 3
def self.perform(user_id, encoded_object_xml, person_ids, dispatcher_class_as_string, retry_count=0)
return true if user_id == '91842' #NOTE 09/08/11 blocking diapsorahqposts
user = User.find(user_id)
people = Person.where(:id => person_ids)

View file

@ -15,11 +15,11 @@ class Postzord::Dispatcher
raise 'this object does not respond_to? to_diaspora xml. try including Diaspora::Webhooks into your object'
end
#if self.object_should_be_processed_as_public?(object)
# Postzord::Dispatcher::Public.new(user, object, opts)
#else
if self.object_should_be_processed_as_public?(object)
Postzord::Dispatcher::Public.new(user, object, opts)
else
Postzord::Dispatcher::Private.new(user, object, opts)
#end
end
end
# @param object [Object]
@ -59,7 +59,7 @@ class Postzord::Dispatcher
self.deliver_to_local(local_people)
end
self.deliver_to_remote(remote_people) unless @sender.username == 'diasporahq' #NOTE: 09/08/11 this is temporary (~3days max) till we fix fanout in federation
self.deliver_to_remote(remote_people)
end
# @return [Array<Person>] Recipients of the object, minus any additional subscribers