Avoid having to check for notices without rendered copies in upgrade.php

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

diff --git a/lib/activityverb.php b/lib/activityverb.php
index 5ee68f28804fcda7eba1589f0e4c682d7cad8cdb..187962d617e6f442bee041fb60258a5390ff8ac4 100644 (file)
--- a/lib/activityverb.php
+++ b/lib/activityverb.php
@@ -48,19 +48,30 @@ class ActivityVerb
     const SHARE    = 'http://activitystrea.ms/schema/1.0/share';
     const SAVE     = 'http://activitystrea.ms/schema/1.0/save';
     const FAVORITE = 'http://activitystrea.ms/schema/1.0/favorite';
+    const LIKE     = 'http://activitystrea.ms/schema/1.0/like'; // This is a synonym of favorite
     const PLAY     = 'http://activitystrea.ms/schema/1.0/play';
     const FOLLOW   = 'http://activitystrea.ms/schema/1.0/follow';
     const FRIEND   = 'http://activitystrea.ms/schema/1.0/make-friend';
     const JOIN     = 'http://activitystrea.ms/schema/1.0/join';
     const TAG      = 'http://activitystrea.ms/schema/1.0/tag';
+    const DELETE   = 'delete';  // the url part is not used anymore, and this feature is new enough to avoid problems with legacy nodes if used without http://...
 
     // Custom OStatus verbs for the flipside until they're standardized
-    const DELETE     = 'http://ostatus.org/schema/1.0/unfollow';
-    const UNFAVORITE = 'http://ostatus.org/schema/1.0/unfavorite';
+    const UNFAVORITE = 'http://activitystrea.ms/schema/1.0/unfavorite';
+    const UNLIKE     = 'http://activitystrea.ms/schema/1.0/unlike'; // This is a synonym of unfavorite
     const UNFOLLOW   = 'http://ostatus.org/schema/1.0/unfollow';
     const LEAVE      = 'http://ostatus.org/schema/1.0/leave';
     const UNTAG      = 'http://ostatus.org/schema/1.0/untag';
 
     // For simple profile-update pings; no content to share.
     const UPDATE_PROFILE = 'http://ostatus.org/schema/1.0/update-profile';
+
+    static function canonical($verb) {
+        $ns = 'http://activitystrea.ms/schema/1.0/';
+        if (substr($verb, 0, mb_strlen($ns)) == $ns) {
+            return substr($verb, mb_strlen($ns));
+        } else {
+            return $verb;
+        }
+    }
 }