X-Git-Url: https://git.ao2.it/tweeper.git/blobdiff_plain/c00b4af91e650a23612cf94067606ec5851e6204..f9473765bc12480112139131381a19e6d60e279f:/src/Tweeper.php diff --git a/src/Tweeper.php b/src/Tweeper.php index 8ac2fe3..9a449a7 100644 --- a/src/Tweeper.php +++ b/src/Tweeper.php @@ -6,7 +6,7 @@ namespace Tweeper; * @file * Tweeper - a Twitter to RSS web scraper. * - * Copyright (C) 2013-2016 Antonio Ospite + * Copyright (C) 2013-2018 Antonio Ospite * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ date_default_timezone_set('UTC'); */ class Tweeper { - private static $userAgent = "Mozilla/5.0 (Windows NT 6.1; rv:22.0) Gecko/20130405 Firefox/22.0"; + private static $userAgent = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:60.0) Gecko/20100101 Firefox/60.0"; /** * Constructor sets up {@link $generate_enclosure}. @@ -249,7 +249,13 @@ class Tweeper { return NULL; } - return Tweeper::jsonToXml($matches[1], 'instagram'); + // The "qe" object contains elements which will result in invalid XML + // element names, so remove it. + $data = json_decode($matches[1], $assoc = TRUE); + unset($data["qe"]); + $json = json_encode($data); + + return Tweeper::jsonToXml($json, 'instagram'); } /** @@ -361,11 +367,11 @@ class Tweeper { } $output = $xsltProcessor->transformToXML($xmlDoc); - if (FALSE === $output) { trigger_error('XSL transformation failed.', E_USER_ERROR); return NULL; } + return $output; }