Merge branch 'patch-29' into 'dev'

Patch 29

See merge request Kostikov/core!3

3 files changed, 34 insertions, 13 deletions

diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 421656023..fe2484d7a 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -230,7 +230,7 @@ Change "/base/directory", and "/path/to/php" as appropriate for your situation.
 If you are using a Linux server, run "crontab -e" and add a line like the 
 one shown, substituting for your unique paths and settings:
 
-*/10 * * * *	cd /home/myname/mywebsite; /usr/bin/php Zotlabs/Daemon/Master.php Cron
+*/10 * * * *	cd /home/myname/mywebsite; /usr/bin/php Zotlabs/Daemon/Master.php Cron > /dev/null 2>&1
 
 You can generally find the location of PHP by executing "which php". If you 
 have troubles with this section please contact your hosting provider for 
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 7fd2cfea8..a5db8e184 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -1,4 +1,3 @@
-
 CREATE TABLE IF NOT EXISTS `abconfig` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `chan` int(10) unsigned NOT NULL DEFAULT 0 ,
@@ -462,7 +461,7 @@ CREATE TABLE IF NOT EXISTS `event` (
   KEY `event_priority` (`event_priority`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
-CREATE TABLE IF NOT EXISTS `groups` (
+CREATE TABLE IF NOT EXISTS `pgrp` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `hash` char(191) NOT NULL DEFAULT '',
   `uid` int(10) unsigned NOT NULL DEFAULT 0 ,
@@ -477,7 +476,7 @@ CREATE TABLE IF NOT EXISTS `groups` (
   KEY `gname` (`gname`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
-CREATE TABLE IF NOT EXISTS `group_member` (
+CREATE TABLE IF NOT EXISTS `pgrp_member` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uid` int(10) unsigned NOT NULL DEFAULT 0 ,
   `gid` int(10) unsigned NOT NULL DEFAULT 0 ,
@@ -736,6 +735,17 @@ CREATE TABLE IF NOT EXISTS `likes` (
   KEY `target_id` (`target_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+CREATE TABLE IF NOT EXISTS listeners (
+  id int(11) NOT NULL AUTO_INCREMENT,
+  target_id varchar(191) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',
+  portable_id varchar(191) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',
+  ltype int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (id),
+  KEY target_id (target_id),
+  KEY portable_id (portable_id),
+  KEY ltype (ltype)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
 CREATE TABLE IF NOT EXISTS `mail` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `convid` int(10) unsigned NOT NULL DEFAULT 0 ,
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 68c65c830..cb4476628 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -434,18 +434,18 @@ create index "event_status_idx" on event ("event_status");
 create index "event_sequence_idx" on event ("event_sequence");
 create index "event_priority_idx" on event ("event_priority");
 
-CREATE TABLE "group_member" (
+CREATE TABLE "pgrp_member" (
   "id" serial  NOT NULL,
   "uid" bigint  NOT NULL,
   "gid" bigint  NOT NULL,
   "xchan" text NOT NULL DEFAULT '',
   PRIMARY KEY ("id")
 );
-create index "groupmember_uid" on group_member ("uid");
-create index "groupmember_gid" on group_member ("gid");
-create index "groupmember_xchan" on group_member ("xchan");
+create index "groupmember_uid" on pgrp_member ("uid");
+create index "groupmember_gid" on pgrp_member ("gid");
+create index "groupmember_xchan" on pgrp_member ("xchan");
 
-CREATE TABLE "groups" (
+CREATE TABLE "pgrp" (
   "id" serial  NOT NULL,
   "hash" text NOT NULL DEFAULT '',
   "uid" bigint  NOT NULL,
@@ -455,10 +455,10 @@ CREATE TABLE "groups" (
   PRIMARY KEY ("id")
 
 );
-create index "groups_uid_idx" on groups ("uid");
-create index "groups_visible_idx" on groups  ("visible");
-create index "groups_deleted_idx" on groups ("deleted");
-create index "groups_hash_idx" on groups ("hash");
+create index "groups_uid_idx" on pgrp ("uid");
+create index "groups_visible_idx" on pgrp  ("visible");
+create index "groups_deleted_idx" on pgrp ("deleted");
+create index "groups_hash_idx" on pgrp ("hash");
 
 CREATE TABLE "hook" (
   "id" serial NOT NULL,
@@ -718,6 +718,17 @@ create index "likes_i_mid" on likes ("i_mid");
 create index "likes_verb" on likes ("verb");
 create index "likes_target_type" on likes ("target_type");
 create index "likes_target_id" on likes ("target_id");
+CREATE TABLE listeners (
+  id serial NOT NULL,
+  target_id text NOT NULL,
+  portable_id text NOT NULL,
+  ltype smallint NOT NULL DEFAULT '0',
+  PRIMARY KEY (id)
+);
+create index "target_id_idx" on listeners ("target_id");
+create index "portable_id_idx" on listeners ("portable_id");
+create index "ltype_idx" on listeners ("ltype");
+
 CREATE TABLE "mail" (
   "id" serial  NOT NULL,
   "convid" bigint  NOT NULL DEFAULT '0',