From 348fa35c6b465b404f0bd056d0917c501a8145eb Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Fri, 17 Jul 2009 12:33:51 -0700
Subject: Also show XML representation of attachments in the API

---
 lib/twitterapi.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'lib/twitterapi.php')

diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 749083c7c..66664334c 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -369,6 +369,9 @@ class TwitterapiAction extends Action
             case 'text':
                 $this->element($element, null, common_xml_safe_str($value));
                 break;
+            case 'attachments':
+                $this->show_xml_attachments($twitter_status['attachments']);
+                break;
             default:
                 $this->element($element, null, $value);
             }
@@ -389,6 +392,20 @@ class TwitterapiAction extends Action
         $this->elementEnd($role);
     }
 
+    function show_xml_attachments($attachments) {
+        if (!empty($attachments)) {
+            $this->elementStart('attachments', array('type' => 'array'));
+            foreach ($attachments as $attachment) {
+                $attrs = array();
+                $attrs['url'] = $attachment['url'];
+                $attrs['mimetype'] = $attachment['mimetype'];
+                $attrs['size'] = $attachment['size'];
+                $this->element('enclosure', $attrs, '');
+            }
+            $this->elementEnd('attachments');
+        }
+    }
+
     function show_twitter_rss_item($entry)
     {
         $this->elementStart('item');
-- 
cgit v1.2.3-54-g00ecf


From 9ec022df93a41c33c15ed0b2b3592f3faff40414 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Fri, 17 Jul 2009 12:39:54 -0700
Subject: Only populate attachments array element if there are attachments

---
 lib/twitterapi.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'lib/twitterapi.php')

diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 66664334c..ab6c0d62c 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -188,15 +188,18 @@ class TwitterapiAction extends Action
 
         # Enclosures
         $attachments = $notice->attachments();
-        $twitter_status['attachments']=array();
-        if($attachments){
-            foreach($attachments as $attachment){
+
+        if (!empty($attachments)) {
+
+            $twitter_status['attachments'] = array();
+
+            foreach ($attachments as $attachment) {
                 if ($attachment->isEnclosure()) {
-                    $enclosure=array();
-                    $enclosure['url']=$attachment->url;
-                    $enclosure['mimetype']=$attachment->mimetype;
-                    $enclosure['size']=$attachment->size;
-                    $twitter_status['attachments'][]=$enclosure;
+                    $enclosure = array();
+                    $enclosure['url'] = $attachment->url;
+                    $enclosure['mimetype'] = $attachment->mimetype;
+                    $enclosure['size'] = $attachment->size;
+                    $twitter_status['attachments'][] = $enclosure;
                 }
             }
         }
-- 
cgit v1.2.3-54-g00ecf