X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Factivity.php;h=b733ff97aaee568c040341d05e398e8955a9ba92;hb=f02d32b718de732181d0f73beed2b7fdb77b1cbd;hp=2d3930df0d85ec46207e6ff63fa9790556f3f664;hpb=343291262e2835e590625584b08610b4eb718fd7;p=quix0rs-gnu-social.git

diff --git a/lib/activity.php b/lib/activity.php
index 2d3930df0d..b733ff97aa 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -244,7 +244,7 @@ class Activity
 
         if (!empty($targetEl)) {
             $this->target = new ActivityObject($targetEl);
-        } elseif (ActivityUtils::compareTypes($this->verb, array(ActivityVerb::FAVORITE))) {
+        } elseif (ActivityUtils::compareVerbs($this->verb, array(ActivityVerb::FAVORITE))) {
             // StatusNet didn't send a 'target' for their Favorite atom entries
             $this->target = clone($this->objects[0]);
         }
@@ -579,8 +579,8 @@ class Activity
 
             if (!empty($this->link)) {
                 $xs->element('link', array('rel' => 'alternate',
-                                           'type' => 'text/html'),
-                             $this->link);
+                                           'type' => 'text/html',
+                                           'href' => $this->link));
             }
 
         }
@@ -625,9 +625,20 @@ 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);
+                $convattr = [];
+                $conv = Conversation::getKV('uri', $this->context->conversation);
+                if ($conv instanceof Conversation) {
+                    $convattr['href'] = $conv->getUrl();
+                    $convattr['local_id'] = $conv->getID();
+                    $convattr['ref'] = $conv->getUri();
+                    $xs->element('link', array('rel' => ActivityContext::CONVERSATION,
+                                                'href' => $convattr['href']));
+                } else {
+                    $convattr['ref'] = $this->context->conversation;
+                }
+                $xs->element(ActivityContext::CONVERSATION,
+                                $convattr,
+                                $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