Revert "src/Tweeper.php: fix rendering Instagram images in some feed readers"

[tweeper.git] / tweeper.php

diff --git a/tweeper.php b/tweeper.php
index 2d5017e..bcc85fe 100644 (file)
--- a/tweeper.php
+++ b/tweeper.php
@@ -4,7 +4,7 @@
  * @file
  * Tweeper - a Twitter to RSS web scraper.
  *
  * @file
  * Tweeper - a Twitter to RSS web scraper.
  *

- * Copyright (C) 2013-2018  Antonio Ospite <ao2@ao2.it>
+ * Copyright (C) 2013-2020  Antonio Ospite <ao2@ao2.it>

  *
  * 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
  *
  * 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


@@ -38,10 +38,10 @@ function is_cli() {
  */
 function usage($argv) {
   if (is_cli()) {
  */
 function usage($argv) {
   if (is_cli()) {

-    $usage = "{$argv[0]} [-e|-m <0|1>|-u <0|1>|-h|--help] <src_url>\n";
+    $usage = "{$argv[0]} [-e|-m <0|1>|-u <0|1>|-v <0|1>|-h|--help] <src_url>\n";

   }
   else {
   }
   else {

-    $usage = htmlentities("{$_SERVER['SCRIPT_NAME']}?src_url=<src_url>&generate_enclosure=<0|1>&show_usernames=<0|1>&show_multimedia=<0|1>");
+    $usage = htmlentities("{$_SERVER['SCRIPT_NAME']}?src_url=<src_url>&generate_enclosure=<0|1>&show_usernames=<0|1>&show_multimedia=<0|1>&verbose_output=<0|1>");

   }
 
   return "usage: $usage";
   }
 
   return "usage: $usage";


@@ -51,17 +51,18 @@ function usage($argv) {
  * Parse command line options.
  */
 function parse_options_cli($argv, $argc) {
  * Parse command line options.
  */
 function parse_options_cli($argv, $argc) {

-  $options = array(
+  $options = [

     'generate_enclosure' => FALSE,
     'show_usernames' => TRUE,
     'show_multimedia' => TRUE,
     'generate_enclosure' => FALSE,
     'show_usernames' => TRUE,
     'show_multimedia' => TRUE,

-  );
+    'verbose_output' => TRUE,
+  ];

 
   if ($argc < 2) {
     return $options;
   }
 
 
   if ($argc < 2) {
     return $options;
   }
 

-  $cli_options = getopt("em:u:h", array("help"));
+  $cli_options = getopt("em:u:v:h", ["help"]);

   foreach ($cli_options as $opt => $val) {
     switch ($opt) {
       case 'e':
   foreach ($cli_options as $opt => $val) {
     switch ($opt) {
       case 'e':


@@ -88,6 +89,16 @@ function parse_options_cli($argv, $argc) {
         $options['show_usernames'] = $val;
         break;
 
         $options['show_usernames'] = $val;
         break;
 

+      case 'v':
+        $ret = filter_var($val, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+        if (NULL === $ret) {
+          fwrite(STDERR, "Invalid argument for the -v option.\n");
+          fwrite(STDERR, usage($argv));
+          exit(1);
+        }
+        $options['verbose_output'] = $val;
+        break;
+

       case 'h':
       case 'help':
         echo usage($argv);
       case 'h':
       case 'help':
         echo usage($argv);


@@ -110,11 +121,12 @@ function parse_options_cli($argv, $argc) {
  * Parse options passed from a query string.
  */
 function parse_options_query_string() {
  * Parse options passed from a query string.
  */
 function parse_options_query_string() {

-  $options = array(
+  $options = [

     'generate_enclosure' => FALSE,
     'show_usernames' => TRUE,
     'show_multimedia' => TRUE,
     'generate_enclosure' => FALSE,
     'show_usernames' => TRUE,
     'show_multimedia' => TRUE,

-  );
+    'verbose_output' => TRUE,
+  ];

 
   if (isset($_GET['src_url'])) {
     $options['src_url'] = $_GET['src_url'];
 
   if (isset($_GET['src_url'])) {
     $options['src_url'] = $_GET['src_url'];


@@ -132,6 +144,10 @@ function parse_options_query_string() {
     $options['show_usernames'] = $_GET['show_usernames'] != 0;
   }
 
     $options['show_usernames'] = $_GET['show_usernames'] != 0;
   }
 

+  if (isset($_GET['verbose_output'])) {
+    $options['verbose_output'] = $_GET['verbose_output'] != 0;
+  }
+

   return $options;
 }
 
   return $options;
 }
 


@@ -149,7 +165,7 @@ if (!isset($options['src_url'])) {
   exit(1);
 }
 
   exit(1);
 }
 

-$tweeper = new Tweeper($options['generate_enclosure'], $options['show_usernames'], $options['show_multimedia']);
+$tweeper = new Tweeper($options['generate_enclosure'], $options['show_usernames'], $options['show_multimedia'], $options['verbose_output']);

 $output = $tweeper->tweep($options['src_url']);
 if (is_null($output)) {
   exit(1);
 $output = $tweeper->tweep($options['src_url']);
 if (is_null($output)) {
   exit(1);