add a few more sql indexes

diff --git a/boot.php b/boot.php
index 93b8c01063a23c8b5410075ed27c31aac9f70010..0e9472c001521a7b80b8ab799f68d9cf848f1dc9 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 define ( 'FRIENDIKA_PLATFORM',     'Friendica');
 define ( 'FRIENDIKA_VERSION',      '2.3.1166' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
-define ( 'DB_UPDATE_VERSION',      1103      );
+define ( 'DB_UPDATE_VERSION',      1104      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --git a/database.sql b/database.sql
index 58b81b0ac52f91c58c209d4f42b1a8bf2e41e59b..924cc49b230da9ff74c775c3a198daca7c24f7b7 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -113,7 +113,8 @@ CREATE TABLE IF NOT EXISTS `contact` (
   KEY `issued-id` (`issued-id`),
   KEY `dfrn-id` (`dfrn-id`),
   KEY `blocked` (`blocked`),
-  KEY `readonly` (`readonly`)  
+  KEY `readonly` (`readonly`),
+  KEY `pending` (`pending`)  
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
@@ -245,8 +246,10 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `origin`  (`origin`),
   KEY `last-child` (`last-child`),
   KEY `unseen` (`unseen`),
+  KEY `wall` (`wall`),
   FULLTEXT KEY `title` (`title`),
   FULLTEXT KEY `body` (`body`),
+  FULLTEXT KEY `tag` (`tag`),
   FULLTEXT KEY `allow_cid` (`allow_cid`),
   FULLTEXT KEY `allow_gid` (`allow_gid`),
   FULLTEXT KEY `deny_cid` (`deny_cid`),
@@ -441,6 +444,10 @@ CREATE TABLE IF NOT EXISTS `user` (
   PRIMARY KEY (`uid`), 
   KEY `nickname` (`nickname`),
   KEY `account_expired` (`account_expired`),
+  KEY `hidewall` (`hidewall`),
+  KEY `blockwall` (`blockwall`),
+  KEY `blocked` (`blocked`),
+  KEY `verified` (`verified`),
   KEY `login_date` (`login_date`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 

diff --git a/include/diaspora.php b/include/diaspora.php
index ff0c0c0d79825bd76b24fd74c8fd032f7ed5f4d3..36457655e5564738cf0db2e08144065900c3a6e1 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -455,7 +455,9 @@ function diaspora_request($importer,$xml) {
                                intval($importer['uid'])
                        );
 
-                       if(count($self)) {
+                       // they are not CONTACT_IS_FOLLOWER anymore but that's what we have in the array
+
+                       if(count($self) && $contact['rel'] == CONTACT_IS_FOLLOWER) {
 
                                $arr = array();
                                $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $importer['uid']);