Shortened user receive, moderated groups.first in the socketing

This commit is contained in:
Raphael 2010-08-17 22:34:01 -07:00
parent 29ecd53361
commit cb152ea3c3
3 changed files with 10 additions and 22 deletions

View file

@ -246,21 +246,6 @@ class User
person.profile = object
person.save
elsif object.is_a?(Post) && object.verify_creator_signature == true
Rails.logger.debug("Saving post: #{object.inspect}")
object.user_refs += 1
object.save
self.raw_visible_posts << object
self.save
group = groups.first
Rails.logger.info("pushing a message to group: #{group.name}")
object.socket_to_uid(id, :group_id => group.id) if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
dispatch_comment object if object.is_a?(Comment) && !owns?(object)
elsif object.is_a?(Comment) && object.verify_post_creator_signature
if object.verify_creator_signature || object.person.nil?
@ -269,10 +254,14 @@ class User
elsif object.verify_creator_signature == true
Rails.logger.debug("Saving object: #{object}")
object.user_refs += 1
object.save
group = groups.find_by_person_id(object.person.id)
object.socket_to_uid(id, :group_id => group.id) if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
self.raw_visible_posts << object
self.save
groups = groups_with_person(object.person)
object.socket_to_uid(id, :group_id => groups.first.id) if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
end
end
@ -303,6 +292,9 @@ class User
groups.detect{|x| x.id == ensure_bson( id ) }
end
def groups_with_person person
groups.select {|group| group.person_ids.include? person.id}
end
protected
def assign_key

View file

@ -28,9 +28,6 @@ describe User do
describe 'post refs' do
before do
@user2 = Factory.create(:user)
@user.activate_friend( @user2.person, @group)
@user3 = Factory.create(:user)
@group3 = @user3.group(:name => 'heroes')
end

View file

@ -4,7 +4,7 @@ describe User do
before do
@user = Factory.create(:user)
@group = @user.group(:name => 'heroes')
@group2 = @user.group(:name => 'stuff')
@group2 = @user.group(:name => 'losers')
@user2 = Factory.create :user
@user2_group = @user2.group(:name => 'dudes')
@ -20,7 +20,6 @@ describe User do
friend_users(@user, @group2, @user4, @user4_group)
end
it 'should generate a valid stream for a group of people' do
status_message1 = @user2.post :status_message, :message => "hi"
status_message2 = @user3.post :status_message, :message => "heyyyy"