From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 9 Nov 2019 21:48:26 +0000 (-0500)
Subject: Merge pull request #7828 from nupplaphil/task/move_enotify
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f2c31ef1c0e92208b58d22791fc72d0ad3e3d6ae;hp=-c;p=friendica.git

Merge pull request #7828 from nupplaphil/task/move_enotify

Remove unnecessary code in "include/enotify"
---

f2c31ef1c0e92208b58d22791fc72d0ad3e3d6ae
diff --combined database.sql
index 86207a1221,b09b8290e0..8630bfba8b
--- a/database.sql
+++ b/database.sql
@@@ -1,6 -1,6 +1,6 @@@
  -- ------------------------------------------
 --- Friendica 2019.09-rc (Dalmatian Bellflower)
 --- DB_UPDATE_VERSION 1322
 +-- Friendica 2019.12-dev (Dalmatian Bellflower)
 +-- DB_UPDATE_VERSION 1324
  -- ------------------------------------------
  
  
@@@ -793,7 -793,6 +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 +809,6 @@@
  	`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))
@@@ -1281,9 -1279,7 +1279,9 @@@ CREATE TABLE IF NOT EXISTS `user-item` 
  	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
  	`hidden` boolean NOT NULL DEFAULT '0' COMMENT 'Marker to hide an item from the user',
  	`ignored` boolean COMMENT 'Ignore this thread if set',
 -	 PRIMARY KEY(`uid`,`iid`)
 +	`pinned` boolean COMMENT 'The item is pinned on the profile page',
 +	 PRIMARY KEY(`uid`,`iid`),
 +	 INDEX `uid_pinned` (`uid`,`pinned`)
  ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User specific item data';
  
  --
diff --combined static/dbstructure.config.php
index 7f4cd71286,e87a84ef92..05c065d9fb
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@@ -868,7 -868,6 +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 +886,6 @@@
  		],
  		"indexes" => [
  			"PRIMARY" => ["id"],
- 			"hash_uid" => ["hash", "uid"],
  			"seen_uid_date" => ["seen", "uid", "date"],
  			"uid_date" => ["uid", "date"],
  			"uid_type_link" => ["uid", "type", "link(190)"],
@@@ -1384,12 -1382,10 +1382,12 @@@
  			"iid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["item" => "id"], "comment" => "Item id"],
  			"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["user" => "uid"], "comment" => "User id"],
  			"hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Marker to hide an item from the user"],
 -			"ignored" => ["type" => "boolean", "comment" => "Ignore this thread if set"]
 +			"ignored" => ["type" => "boolean", "comment" => "Ignore this thread if set"],
 +			"pinned" => ["type" => "boolean", "comment" => "The item is pinned on the profile page"]
  		],
  		"indexes" => [
 -			"PRIMARY" => ["uid", "iid"]
 +			"PRIMARY" => ["uid", "iid"],
 +			"uid_pinned" => ["uid", "pinned"]
  		]
  	],
  	"worker-ipc" => [