Remove util.min.js (minifying is EVIL)

[quix0rs-gnu-social.git] / lib / activity.php

diff --git a/lib/activity.php b/lib/activity.php
index 7546e2cd432c2fc6f8f82c6ab0402d3cab8e95ef..8be37c568166269d9c7e5322a00c6ed681a5b5f9 100644 (file)
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -622,28 +622,14 @@ class Activity
             }
 
             if (!empty($this->context->conversation)) {
-                $xs->element('link', array('rel' => 'ostatus:conversation',
+                $xs->element('link', array('rel' => ActivityContext::CONVERSATION,
                                            'href' => $this->context->conversation));
             }
 
-            foreach ($this->context->attention as $attnURI) {
-                $xs->element('link', array('rel' => 'ostatus:attention',
+            foreach ($this->context->attention as $attnURI=>$type) {
+                $xs->element('link', array('rel' => ActivityContext::MENTIONED,
+                                           ActivityContext::OBJECTTYPE => $type,  // FIXME: undocumented 
                                            'href' => $attnURI));
-                $xs->element('link', array('rel' => 'mentioned',
-                                           '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)) {