new hold status and url checks #156

openrightsgroup · Oct 28, 2021 · 7138490 · 7138490
1 parent 5322bc5
commit 7138490
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/api/1.2/api.php b/api/1.2/api.php
@@ -1656,7 +1656,7 @@ function result_callback($msg, $queue) {
     if (!(@count($data['networks']) == 1 && ($data['networks'][0] == 'ORG' || $data['networks'][0] == "BBFC"))) {
         // we are submittingt to ISPs, not feedback to ORG or BBFC
         if ($app['db.blacklist.load']->check($url['url'])) {
-            debug_log("{$url['url']} is blacklisted; not submitting");
+            debug_log("{$url['url']} cannot be submitted");
             return $app->json(array('success' => false, 'message' => 'domain rejected'));
         }
     }
@@ -1695,6 +1695,8 @@ function result_callback($msg, $queue) {
     $ids = array();
     $queued = array();
     $rejected = array();
+
+    $hold = $app['db.url.load']->has_hold_category($url['urlid']);
     foreach($data['networks'] as $network_name) {
         debug_log("Looking up: ". $network_name);
         $age_limit = false;
@@ -1724,6 +1726,10 @@ function result_callback($msg, $queue) {
             continue;
         }
 
+        if ($hold) {
+            $queued[] = $network_name;
+        }
+
         if ($app['db.ispreport.load']->can_report($url['urlid'], $network_name)) {
 
             $mailname = "reply-" . strtolower(Middleware::generateSharedSecret(12));
@@ -1738,14 +1744,14 @@ function result_callback($msg, $queue) {
                 (@$data['send_updates'] ? 1 : 0),
                 $contact['id'],
                 (@$data['allow_publish'] ? 1: 0),
-                $age_limit ? 'pending' : 'sent',
+                $hold ? 'hold' : $age_limit ? 'pending' : 'sent',
                 @$data['category'],
                 (@$data['allow_contact'] ? 1: 0),
                 @$data['usertype'] ? $data['usertype'] : null
                 );
             # send email here
 
-            if (($contact['verified'] || $network_name == 'ORG') && $network_name != 'BBFC' && $age_limit == false) {
+            if (($contact['verified'] || $network_name == 'ORG') && $network_name != 'BBFC' && $age_limit == false && $hold == false) {
                 sendISPReport(
                     $mailname,
                     $data['reporter']['name'],

diff --git a/api/1.2/libs/services.php b/api/1.2/libs/services.php
@@ -221,6 +221,21 @@ function load_categories_ns($urlID) {
 		return $out;
 	}
 
+    function has_hold_category($urlID) {
+        $result = $this->conn->query(
+            "select count(*) from url_categories
+                inner join categories on category_id = categories.id
+             where categories.hold = true and urlid = ?",
+            array($urlID),
+            PDO::FETCH_NUM
+            );
+        $row = $result->fetch();
+        if ($row[0] > 0) {
+            return true;
+        }
+        return false;
+    }
+
 	function updateLastPolled($urlid) {
 		$result = $this->conn->query("update urls set lastPolled=now() where urlID=?",
 			array($urlid));

diff --git a/sql/pg.schema.sql b/sql/pg.schema.sql
@@ -97,6 +97,7 @@ CREATE TYPE public.enum_probe_status AS ENUM (
 CREATE TYPE public.enum_report_status AS ENUM (
     'new',
     'pending',
+    'hold',
     'sent',
     'abuse',
     'cancelled',
@@ -611,6 +612,7 @@ CREATE TABLE public.categories (
     tree public.ltree,
     name text,
     name_fts tsvector,
+    hold bool default false,
     namespace character varying(16),
     created timestamp with time zone,
     last_updated timestamp with time zone