base/app/models/actor.rb in social_stream-0.28.4 vs base/app/models/actor.rb in social_stream-0.29.0

@@ -134,17 +134,15 @@
   }
 
   after_create :create_initial_relations
   
   after_create :save_or_create_profile
-  
-  class << self
-    def find_by_webfinger!(link)
-      link =~ /(acct:)?(.*)@/
 
-      find_by_slug! $2
-    end
+  # FIXME SocialStream::ActivityStreams::Supertype should take precedence over
+  # SocialStream::ActivityStreams::Subtype
+  def as_object_type
+    subtype_instance.as_object_type
   end
   
   #Returning the email address of the model if an email should be sent for this object (Message or Notification).
   #If the actor is a Group and has no email address, an array with the email of the highest rank members will be
   #returned isntead.
@@ -588,7 +586,5 @@
   
   def unread_messages_count
     mailbox.inbox(:unread => true).count(:id, :distinct => true)
   end
 end
-
-ActiveSupport.run_load_hooks(:actor, Actor)