diff --git a/app/models/post.rb b/app/models/post.rb index b0d47093e..64a1946de 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -29,6 +29,11 @@ class Post < ActiveRecord::Base self.post_visibilities.count end + def diaspora_handle= nd + self.person = Person.where(:diaspora_handle => nd).first + write_attribute(:diaspora_handle, nd) + end + def self.diaspora_initialize params new_post = self.new params.to_hash new_post.person = params[:person] diff --git a/db/schema.rb b/db/schema.rb index ecb16a236..7fd4f2296 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -112,7 +112,6 @@ ActiveRecord::Schema.define(:version => 0) do t.string "diaspora_handle" t.string "guid" t.boolean "pending", :default => false - t.integer "user_refs", :default => 0 t.string "type" t.text "message" t.integer "status_message_id" diff --git a/lib/diaspora/user/receiving.rb b/lib/diaspora/user/receiving.rb index 66b0452b2..67e3f94ed 100644 --- a/lib/diaspora/user/receiving.rb +++ b/lib/diaspora/user/receiving.rb @@ -32,8 +32,6 @@ module Diaspora xml_author = (owns?(object.post)) ? object.diaspora_handle : object.post.person.diaspora_handle else xml_author = object.diaspora_handle - pp xml_author - pp salmon_author end if (salmon_author.diaspora_handle != xml_author) @@ -158,9 +156,7 @@ module Diaspora on_pod = existing_post(post) log_string = "event=receive payload_type=#{post.class} sender=#{post.diaspora_handle} " if on_pod - puts "On pod" if post_visible?(post) - puts "visible" if post.mutable? on_pod.caption = post.caption on_pod.save! @@ -183,7 +179,6 @@ module Diaspora def add_post_to_aspects(post) Rails.logger.debug("event=add_post_to_aspects user_id=#{self.id} post_id=#{post.id}") - puts("event=add_post_to_aspects user_id=#{self.id} post_id=#{post.id}") aspects = self.aspects_with_person(post.person) aspects.each do |aspect| diff --git a/spec/models/status_message_spec.rb b/spec/models/status_message_spec.rb index 197734acd..e523dfd41 100644 --- a/spec/models/status_message_spec.rb +++ b/spec/models/status_message_spec.rb @@ -11,6 +11,14 @@ describe StatusMessage do @aspect = @user.aspects.create(:name => "losers") end + describe '#diaspora_handle=' do + it 'sets #person' do + person = Factory.create(:person) + post = Factory.create(:status_message, :person => @user.person) + post.diaspora_handle = person.diaspora_handle + post.person.should == person + end + end it "should have either a message or at least one photo" do n = Factory.build(:status_message, :message => nil) n.valid?.should be_false