X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Factivity.php;h=2d3930df0d85ec46207e6ff63fa9790556f3f664;hb=a3b9367c9aea253d560db7d9b16d625cd0953a62;hp=051993ddff3f587237a07a8e4effc692b1724c3f;hpb=2e3ef4cc078a29be245c6b19f5c8d900d9fe75cc;p=quix0rs-gnu-social.git

diff --git a/lib/activity.php b/lib/activity.php
index 051993ddff..2d3930df0d 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -244,6 +244,9 @@ class Activity
 
         if (!empty($targetEl)) {
             $this->target = new ActivityObject($targetEl);
+        } elseif (ActivityUtils::compareTypes($this->verb, array(ActivityVerb::FAVORITE))) {
+            // StatusNet didn't send a 'target' for their Favorite atom entries
+            $this->target = clone($this->objects[0]);
         }
 
         $this->summary = ActivityUtils::childContent($entry, 'summary');
@@ -624,28 +627,22 @@ class Activity
             if (!empty($this->context->conversation)) {
                 $xs->element('link', array('rel' => ActivityContext::CONVERSATION,
                                            'href' => $this->context->conversation));
+                $xs->element(ActivityContext::CONVERSATION, null, $this->context->conversation);
+                /* Since we use XMLWriter we just use the previously hardcoded prefix for ostatus,
+                    otherwise we should use something like this:
+                $xs->elementNS(array(ActivityContext::OSTATUS => 'ostatus'),    // namespace
+                                'conversation',  // tag (or the element name from ActivityContext::CONVERSATION)
+                                null,   // attributes
+                                $this->context->conversation);  // content
+                */
             }
 
-            foreach ($this->context->attention as $attnURI) {
-                $xs->element('link', array('rel' => ActivityContext::ATTENTION,
-                                           'href' => $attnURI));
+            foreach ($this->context->attention as $attnURI=>$type) {
                 $xs->element('link', array('rel' => ActivityContext::MENTIONED,
+                                           ActivityContext::OBJECTTYPE => $type,  // FIXME: undocumented 
                                            'href' => $attnURI));
             }
 
-            // XXX: shoulda used ActivityVerb::SHARE
-
-            if (!empty($this->context->forwardID)) {
-                if (!empty($this->context->forwardUrl)) {
-                    $xs->element('ostatus:forward',
-                                 array('ref' => $this->context->forwardID,
-                                       'href' => $this->context->forwardUrl));
-                } else {
-                    $xs->element('ostatus:forward',
-                                 array('ref' => $this->context->forwardID));
-                }
-            }
-
             if (!empty($this->context->location)) {
                 $loc = $this->context->location;
                 $xs->element('georss:point', null, $loc->lat . ' ' . $loc->lon);