DBA: Do a fallback to other db functions on problems

[friendica.git] / include / diaspora.php

diff --git a/include/diaspora.php b/include/diaspora.php
index 671bb34ae59406761b242f7f1e77b3e9aec14d9a..77c459e649830ed16e89cad5abd7340ab2ae847c 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -880,11 +880,14 @@ class Diaspora {
                if (dbm::is_result($r)) {
                        return $r[0];
                } else {
-                       // We haven't found it?
-                       // We use another function for it that will possibly create a contact entry
+                       /*
+                        * We haven't found it?
+                        * We use another function for it that will possibly create a contact entry.
+                        */
                        $cid = get_contact($handle, $uid);
 
                        if ($cid > 0) {
+                               /// @TODO Contact retrieval should be encapsulated into an "entity" class like `Contact`
                                $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
 
                                if (dbm::is_result($r)) {
@@ -919,9 +922,11 @@ class Diaspora {
         */
        private static function post_allow($importer, $contact, $is_comment = false) {
 
-               // perhaps we were already sharing with this person. Now they're sharing with us.
-               // That makes us friends.
-               // Normally this should have handled by getting a request - but this could get lost
+               /*
+                * Perhaps we were already sharing with this person. Now they're sharing with us.
+                * That makes us friends.
+                * Normally this should have handled by getting a request - but this could get lost
+                */
                if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
                        q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
                                intval(CONTACT_IS_FRIEND),
@@ -934,16 +939,19 @@ class Diaspora {
 
                // We don't seem to like that person
                if ($contact["blocked"] || $contact["readonly"] || $contact["archive"]) {
+                       // Maybe blocked, don't accept.
                        return false;
-               // We are following this person? Then it is okay
+               // We are following this person?
                } elseif (($contact["rel"] == CONTACT_IS_SHARING) || ($contact["rel"] == CONTACT_IS_FRIEND)) {
+                       // Yes, then it is fine.
                        return true;
-               // Is it a post to a community? That's good
+               // Is it a post to a community?
                } elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && ($importer["page-flags"] == PAGE_COMMUNITY)) {
+                       // That's good
                        return true;
-               }
-               // Messages for the global users and comments are always accepted
-               if (($importer["uid"] == 0) || $is_comment) {
+               // Is the message a global user or a comment?
+               } elseif (($importer["uid"] == 0) || $is_comment) {
+                       // Messages for the global users and comments are always accepted
                        return true;
                }
 
@@ -1521,6 +1529,8 @@ class Diaspora {
 
                $person = self::person_by_handle($msg_author);
 
+               dba::lock('mail');
+
                $r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
                        dbesc($msg_guid),
                        intval($importer["uid"])
@@ -1548,6 +1558,8 @@ class Diaspora {
                        dbesc($msg_created_at)
                );
 
+               dba::unlock();
+
                q("UPDATE `conv` SET `updated` = '%s' WHERE `id` = %d",
                        dbesc(datetime_convert()),
                        intval($conversation["id"])
@@ -1824,6 +1836,12 @@ class Diaspora {
                        return false;
                }
 
+               $body = diaspora2bb($text);
+
+               $body = self::replace_people_guid($body, $person["url"]);
+
+               dba::lock('mail');
+
                $r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
                        dbesc($guid),
                        intval($importer["uid"])
@@ -1833,10 +1851,6 @@ class Diaspora {
                        return false;
                }
 
-               $body = diaspora2bb($text);
-
-               $body = self::replace_people_guid($body, $person["url"]);
-
                q("INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
                                VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
                        intval($importer["uid"]),
@@ -1855,6 +1869,8 @@ class Diaspora {
                        dbesc($created_at)
                );
 
+               dba::unlock();
+
                q("UPDATE `conv` SET `updated` = '%s' WHERE `id` = %d",
                        dbesc(datetime_convert()),
                        intval($conversation["id"])
@@ -3713,7 +3729,7 @@ class Diaspora {
                 * This will break Diaspora compatibility with Friendica versions prior to 3.5.
                 */
                q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
-                       intval($message_id),
+                       intval($post_id),
                        dbesc(json_encode($message))
                );