Merge branch 'fixes/private_scope_on_tags' into social-master

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

diff --git a/lib/feed.php b/lib/feed.php
index e5a97a0cb839af2555e42e692ef7e4dc0d50bc18..e04c69be6c8e7edd31037d60538333a1de0df23f 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;
@@ -72,6 +73,8 @@ class Feed
             return 'application/atom+xml';
          case Feed::FOAF:
             return 'application/rdf+xml';
+         case Feed::JSON:
+            return 'application/stream+json';
          default:
             return null;
         }
@@ -92,6 +95,9 @@ class Feed
          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;
         }
@@ -103,6 +109,7 @@ class Feed
          case Feed::RSS1:
          case Feed::RSS2:
          case Feed::ATOM:
+         case Feed::JSON:
             return 'alternate';
          case Feed::FOAF:
             return 'meta';