Merge pull request #6531 from Ixiter/develop-theme-frio

[friendica.git] / src / Util / JsonLD.php

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index cd3a6ec2708899d49483a7bfb3c73a92c7d762cf..8cc9f274d903f25a56561c5c3259c442b2e0e6e9 100644 (file)
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -18,7 +18,8 @@ class JsonLD
         *
         * @param $url
         *
-        * @return the loaded data
+        * @return mixed the loaded data
+        * @throws \JsonLdException
         */
        public static function documentLoader($url)
        {
@@ -53,7 +54,8 @@ class JsonLD
         *
         * @param array $json
         *
-        * @return normalized JSON string
+        * @return mixed|bool normalized JSON string
+        * @throws Exception
         */
        public static function normalize($json)
        {
@@ -77,7 +79,8 @@ class JsonLD
         *
         * @param array $json
         *
-        * @return comacted JSON array
+        * @return array Compacted JSON array
+        * @throws Exception
         */
        public static function compact($json)
        {
@@ -93,6 +96,12 @@ class JsonLD
                        'dc' => (object)['@id' => 'http://purl.org/dc/terms/', '@type' => '@id'],
                        'toot' => (object)['@id' => 'http://joinmastodon.org/ns#', '@type' => '@id']];
 
+               // Workaround for Nextcloud Social
+               // See issue https://github.com/nextcloud/social/issues/330
+               if (!empty($json['@context']) && is_array($json['@context'])) {
+                       $json['@context'][] = 'https://w3id.org/security/v1';
+               }
+
                // Trying to avoid memory problems with large content fields
                if (!empty($json['object']['source']['content'])) {
                        $content = $json['object']['source']['content'];
@@ -125,7 +134,7 @@ class JsonLD
         * @param $element
         * @param $key
         *
-        * @return fetched element array
+        * @return array fetched element
         */
        public static function fetchElementArray($array, $element, $key = '@id')
        {
@@ -166,7 +175,7 @@ class JsonLD
         * @param $type
         * @param $type_value
         *
-        * @return fetched element
+        * @return string fetched element
         */
        public static function fetchElement($array, $element, $key = '@id', $type = null, $type_value = null)
        {