Some notification thingy

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 706b3650d8235c38a626de733583099dd0f2c145..646fc408cfae7504cdfddf753e6bf80a568310b4 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -538,7 +538,7 @@ function db_definition($charset) {
                                        "site-pubkey" => array("type" => "text"),
                                        "issued-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "dfrn-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "url" => array("type" => "varchar(255)", "not null" => "1", "default" => "", "collation" => "bin"),
+                                       "url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "nurl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "addr" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "alias" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1074,7 +1074,10 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "uid" => array("uid"),
+                                       "uid_hash" => array("uid", "hash"),
+                                       "uid_seen" => array("uid", "seen"),
+                                       "uid_type_link" => array("uid", "type", "link"),
+                                       "uid_link" => array("uid", "link"),
                                        )
                        );
        $database["notify-threads"] = array(

diff --git a/include/enotify.php b/include/enotify.php
index aa29e117a697d8b6c983c42f1dd5616a9c857cad..ebc27309dbe61710b76241f84bfd28e6f8ce0b1d 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -105,7 +105,7 @@ function notification($params) {
                // If so don't create a second notification
 
                $p = null;
-               $p = q("SELECT `id` FROM `notify` WHERE (`type` = %d OR `type` = %d OR `type` = %d) AND `link` = '%s' AND `uid` = %d LIMIT 1",
+               $p = q("SELECT `id` FROM `notify` WHERE `type` IN (%d, %d, %d) AND `link` = '%s' AND `uid` = %d LIMIT 1",
                        intval(NOTIFY_TAGSELF),
                        intval(NOTIFY_COMMENT),
                        intval(NOTIFY_SHARE),
@@ -472,7 +472,7 @@ function notification($params) {
                // After we've stored everything, look again to see if there are any duplicates and if so remove them
 
                $p = null;
-               $p = q("SELECT `id` FROM `notify` WHERE (`type` = %d OR `type` = %d) AND `link` = '%s' AND `uid` = %d ORDER BY `id`",
+               $p = q("SELECT `id` FROM `notify` WHERE `type` IN (%d, %d) AND `link` = '%s' AND `uid` = %d ORDER BY `id`",
                        intval(NOTIFY_TAGSELF),
                        intval(NOTIFY_COMMENT),
                        dbesc($params['link']),