diff --git a/database.sql b/database.sql index d42f61f90..b09b8290e 100644 --- a/database.sql +++ b/database.sql @@ -793,7 +793,6 @@ CREATE TABLE IF NOT EXISTS `manage` ( -- CREATE TABLE IF NOT EXISTS `notify` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', - `hash` varchar(64) NOT NULL DEFAULT '' COMMENT '', `type` smallint unsigned NOT NULL DEFAULT 0 COMMENT '', `name` varchar(255) NOT NULL DEFAULT '' COMMENT '', `url` varchar(255) NOT NULL DEFAULT '' COMMENT '', @@ -810,7 +809,6 @@ CREATE TABLE IF NOT EXISTS `notify` ( `name_cache` tinytext COMMENT 'Cached bbcode parsing of name', `msg_cache` mediumtext COMMENT 'Cached bbcode parsing of msg', PRIMARY KEY(`id`), - INDEX `hash_uid` (`hash`,`uid`), INDEX `seen_uid_date` (`seen`,`uid`,`date`), INDEX `uid_date` (`uid`,`date`), INDEX `uid_type_link` (`uid`,`type`,`link`(190)) diff --git a/include/enotify.php b/include/enotify.php index a8090e35f..2f3b6b49b 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -503,17 +503,9 @@ function notification($params) if ($show_in_notification_page) { Logger::log("adding notification entry", Logger::DEBUG); - do { - $dups = false; - $hash = Strings::getRandomHex(); - if (DBA::exists('notify', ['hash' => $hash])) { - $dups = true; - } - } while ($dups == true); /// @TODO One statement is enough $datarray = []; - $datarray['hash'] = $hash; $datarray['name'] = $params['source_name']; $datarray['name_cache'] = strip_tags(BBCode::convert($params['source_name'])); $datarray['url'] = $params['source_link']; @@ -536,7 +528,7 @@ function notification($params) } // create notification entry in DB - $fields = ['hash' => $datarray['hash'], 'name' => $datarray['name'], 'url' => $datarray['url'], + $fields = ['name' => $datarray['name'], 'url' => $datarray['url'], 'photo' => $datarray['photo'], 'date' => $datarray['date'], 'uid' => $datarray['uid'], 'link' => $datarray['link'], 'iid' => $datarray['iid'], 'parent' => $datarray['parent'], 'type' => $datarray['type'], 'verb' => $datarray['verb'], 'otype' => $datarray['otype'], diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 53f8a8ed4..e87a84ef9 100755 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -34,7 +34,7 @@ use Friendica\Database\DBA; if (!defined('DB_UPDATE_VERSION')) { - define('DB_UPDATE_VERSION', 1323); + define('DB_UPDATE_VERSION', 1324); } return [ @@ -868,7 +868,6 @@ return [ "comment" => "notifications", "fields" => [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], - "hash" => ["type" => "varchar(64)", "not null" => "1", "default" => "", "comment" => ""], "type" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""], "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], @@ -887,7 +886,6 @@ return [ ], "indexes" => [ "PRIMARY" => ["id"], - "hash_uid" => ["hash", "uid"], "seen_uid_date" => ["seen", "uid", "date"], "uid_date" => ["uid", "date"], "uid_type_link" => ["uid", "type", "link(190)"],