lib/stream/fires.rb in Stream-0.1.16 vs lib/stream/fires.rb in Stream-0.1.18

@@ -32,31 +32,13 @@
           end
           
           create_options[:activity_type] = activity_type.to_s
           
           transaction do
-            activity = ActivityItem.new(create_options)
+            activity = ActivityItem.create!(create_options)
             if activity_type.to_s.eql?'new_message'
               activity.subject.recipient.activity_items << activity
-            elsif activity_type.to_s.eql?'new_photo'
-              
-              gallery = activity.subject.gallery
-              photo = activity.subject
-              # Find recent photo activity
-              last_activity = ActivityItem.find(:first, 
-                                                :conditions => ["subject_type = ? AND photos.gallery_id = ? AND DATE(activity_items.updated_at) = current_date",
-                                                activity.subject.class,gallery.id],:include=>[:photos])
-                                                
-              unless last_activity && (gallery.eql?(last_activity.subject.gallery))
-                ([activity.actor] + gallery.allowed_contacts).each do |p| 
-                  activity.is_hidden = activity.subject.approval_status==true ? true : false 
-                  activity.photos << activity.subject
-                  activity.save
-                  p.activity_items << activity
-                end
-              end
             else
-              activity.save  
               ([activity.actor] + activity.actor.contacts).each{|p| p.activity_items << activity }
             end
           end
           
           send(:"after_#{opts[:on]}", method_name, :if => opts[:if])