Merge remote-tracking branch 'upstream/nightly' into nightly

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

diff --git a/lib/feed.php b/lib/feed.php
index 5902653679ab2ea914a3b341b14074c1a799f8db..d61c3e8a3433a6e1d698809a5eeadb8e0b2bbca1 100644 (file)
--- a/lib/feed.php
+++ b/lib/feed.php
@@ -49,6 +49,7 @@ class Feed
     const RSS2 = 2;
     const ATOM = 3;
     const FOAF = 4;
+    const JSON = 5; // Activity Streams
 
     var $type = null;
     var $url = null;
@@ -61,6 +62,11 @@ class Feed
         $this->title = $title;
     }
 
+    function getUrl()
+    {
+        return $this->url;
+    }
+
     function mimeType()
     {
         switch ($this->type) {
@@ -72,6 +78,8 @@ class Feed
             return 'application/atom+xml';
          case Feed::FOAF:
             return 'application/rdf+xml';
+         case Feed::JSON:
+            return 'application/stream+json';
          default:
             return null;
         }
@@ -81,13 +89,20 @@ class Feed
     {
         switch ($this->type) {
          case Feed::RSS1:
+            // TRANS: Feed type name.
             return _('RSS 1.0');
          case Feed::RSS2:
+            // TRANS: Feed type name.
             return _('RSS 2.0');
          case Feed::ATOM:
+            // TRANS: Feed type name.
             return _('Atom');
          case Feed::FOAF:
+            // TRANS: Feed type name. FOAF stands for Friend of a Friend.
             return _('FOAF');
+         case Feed::JSON:
+            // TRANS: Feed type name. See http://activitystrea.ms/
+            return _('Activity Streams');
          default:
             return null;
         }
@@ -99,6 +114,7 @@ class Feed
          case Feed::RSS1:
          case Feed::RSS2:
          case Feed::ATOM:
+         case Feed::JSON:
             return 'alternate';
          case Feed::FOAF:
             return 'meta';