From aaffa6f5c5ebdd3939a26703b3dd4d958aba9d0e Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Tue, 14 Mar 2023 15:59:58 -0400
Subject: [PATCH] Adding support for blacklisting certain Flickr images

---
 scripts/overview.php          | 20 +++++++++++++++-----
 scripts/todays_detections.php | 20 +++++++++++++++-----
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/scripts/overview.php b/scripts/overview.php
index 1991838..477ba53 100644
--- a/scripts/overview.php
+++ b/scripts/overview.php
@@ -93,11 +93,21 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true" && isse
             }
           }
 
-         $flickrjson = json_decode(file_get_contents("https://www.flickr.com/services/rest/?method=flickr.photos.search&api_key=".$config["FLICKR_API_KEY"]."&text=".str_replace(" ", "%20", $engname).$comnameprefix."&sort=relevance".$args."&per_page=5&media=photos&format=json&nojsoncallback=1"), true)["photos"]["photo"][0];
-          $modaltext = "https://flickr.com/photos/".$flickrjson["owner"]."/".$flickrjson["id"];
-          $authorlink = "https://flickr.com/people/".$flickrjson["owner"];
-          $imageurl = 'https://farm' .$flickrjson["farm"]. '.static.flickr.com/' .$flickrjson["server"]. '/' .$flickrjson["id"]. '_'  .$flickrjson["secret"].  '.jpg';
-          array_push($_SESSION['images'], array($comname,$imageurl,$flickrjson["title"], $modaltext, $authorlink));
+         // Make the API call
+          $flickrjson = json_decode(file_get_contents("https://www.flickr.com/services/rest/?method=flickr.photos.search&api_key=".$config["FLICKR_API_KEY"]."&text=".str_replace(" ", "%20", $engname).$comnameprefix."&sort=relevance".$args."&per_page=5&media=photos&format=json&nojsoncallback=1"), true)["photos"]["photo"];
+
+          // Find the first photo that is not blacklisted
+          $photo = null;
+          foreach ($flickrjson as $flickrphoto) {
+              if ($flickrphoto["id"] !== "4892923285") {
+                  $photo = $flickrphoto;
+                  break;
+              }
+          }
+          $modaltext = "https://flickr.com/photos/".$photo["owner"]."/".$photo["id"];
+          $authorlink = "https://flickr.com/people/".$photo["owner"];
+          $imageurl = 'https://farm' .$photo["farm"]. '.static.flickr.com/' .$photo["server"]. '/' .$photo["id"]. '_'  .$photo["secret"].  '.jpg';
+          array_push($_SESSION['images'], array($comname,$imageurl,$photo["title"], $modaltext, $authorlink));
           $image = $_SESSION['images'][count($_SESSION['images'])-1];
         }
       }
diff --git a/scripts/todays_detections.php b/scripts/todays_detections.php
index 2c8355e..495e0f2 100644
--- a/scripts/todays_detections.php
+++ b/scripts/todays_detections.php
@@ -264,11 +264,21 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true"  ) {
           break;
         }
       }
-      $flickrjson = json_decode(file_get_contents("https://www.flickr.com/services/rest/?method=flickr.photos.search&api_key=".$config["FLICKR_API_KEY"]."&text=".str_replace(" ", "%20", $engname).$comnameprefix."&sort=relevance".$args."&per_page=5&media=photos&format=json&nojsoncallback=1"), true)["photos"]["photo"][0];
-      $modaltext = "https://flickr.com/photos/".$flickrjson["owner"]."/".$flickrjson["id"];
-      $authorlink = "https://flickr.com/people/".$flickrjson["owner"];
-      $imageurl = 'https://farm' .$flickrjson["farm"]. '.static.flickr.com/' .$flickrjson["server"]. '/' .$flickrjson["id"]. '_'  .$flickrjson["secret"].  '.jpg';
-      array_push($_SESSION['images'], array($comname,$imageurl,$flickrjson["title"], $modaltext, $authorlink));
+      // Make the API call
+      $flickrjson = json_decode(file_get_contents("https://www.flickr.com/services/rest/?method=flickr.photos.search&api_key=".$config["FLICKR_API_KEY"]."&text=".str_replace(" ", "%20", $engname).$comnameprefix."&sort=relevance".$args."&per_page=5&media=photos&format=json&nojsoncallback=1"), true)["photos"]["photo"];
+
+      // Find the first photo that is not blacklisted
+      $photo = null;
+      foreach ($flickrjson as $flickrphoto) {
+          if ($flickrphoto["id"] !== "4892923285") {
+              $photo = $flickrphoto;
+              break;
+          }
+      }
+      $modaltext = "https://flickr.com/photos/".$photo["owner"]."/".$photo["id"];
+      $authorlink = "https://flickr.com/people/".$photo["owner"];
+      $imageurl = 'https://farm' .$photo["farm"]. '.static.flickr.com/' .$photo["server"]. '/' .$photo["id"]. '_'  .$photo["secret"].  '.jpg';
+      array_push($_SESSION['images'], array($comname,$imageurl,$photo["title"], $modaltext, $authorlink));
       $image = $_SESSION['images'][count($_SESSION['images'])-1];
     }
   }