From e5126ebb773a55bc8350d4b8c77464925119ee8c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 20 Jun 2011 10:48:02 -0400
Subject: [PATCH] Fine-tuning Blog_entry class

Gave it a different object type (Article), fine-tuned the summary process, and
made sure to return the saved Notice in saveNew().
---
 plugins/Blog/Blog_entry.php | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/plugins/Blog/Blog_entry.php b/plugins/Blog/Blog_entry.php
index 0e4df28b82..54bd445930 100644
--- a/plugins/Blog/Blog_entry.php
+++ b/plugins/Blog/Blog_entry.php
@@ -59,7 +59,7 @@ class Blog_entry extends Managed_DataObject
     public $created; // datetime
     public $modified; // datetime
 
-    const TYPE = 'http://activitystrea.ms/schema/1.0/blog-entry';
+    const TYPE = ActivityObject::ARTICLE;
     
     function staticGet($k, $v=null)
     {
@@ -170,20 +170,26 @@ class Blog_entry extends Managed_DataObject
 
         // XXX: this might be too long.
 
-        $options['rendered'] = $be->summary . ' ' . 
-            XMLStringer::estring('a', array('href' => $shortUrl,
-                                            'class' => 'blog-entry'),
-                                 _('More...'));
+        if (!empty($be->summary)) {
+            $options['rendered'] = $be->summary . ' ' . 
+                XMLStringer::estring('a', array('href' => $url,
+                                                'class' => 'blog-entry'),
+                                     _('More...'));
+            $content = html_entity_decode(strip_tags($text), ENT_QUOTES, 'UTF-8');
+
+        } else {
+            $options['rendered'] = $be->content . ' ' . 
+                XMLStringer::estring('a', array('href' => $url,
+                                                'class' => 'blog-entry'),
+                                     _('More...'));
+        }
 
-        $summaryText = html_entity_decode(strip_tags($summary), ENT_QUOTES, 'UTF-8');
 
-        if (Notice::contentTooLong($summaryText)) {
-            $summaryText = substr($summaryText, 0, Notice::maxContent() - mb_strlen($shortUrl) - 2) .
+        if (Notice::contentTooLong($content)) {
+            $content = substr($content, 0, Notice::maxContent() - mb_strlen($shortUrl) - 2) .
                 '… ' . $shortUrl;
         }
 
-        $content = $summaryText;
-
         // Override this no matter what.
         
         $options['object_type'] = self::TYPE;
@@ -191,7 +197,9 @@ class Blog_entry extends Managed_DataObject
         $source = array_key_exists('source', $options) ?
                                     $options['source'] : 'web';
         
-        Notice::saveNew($profile->id, $content, $source, $options);
+        $saved = Notice::saveNew($profile->id, $content, $source, $options);
+
+        return $saved;
     }
 
     /**
-- 
2.39.5