Issue 3857: There is the possibility of a bad handling of dislikes

[friendica.git] / include / socgraph.php

diff --git a/include/socgraph.php b/include/socgraph.php
index d3f70075b2ffe1cf2b8ab3e3051df4ad538fee29..f0a855d70c9d91412bca5c480af4a5a5b2055f18 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -1146,6 +1146,7 @@ function poco_check_server($server_url, $network = "", $force = false) {
                }
 
                // Test for Mastodon
+               $orig_version = $version;
                $serverret = z_fetch_url($server_url."/api/v1/instance");
                if ($serverret["success"] && ($serverret["body"] != '')) {
                        $data = json_decode($serverret["body"]);
@@ -1157,6 +1158,10 @@ function poco_check_server($server_url, $network = "", $force = false) {
                                $network = NETWORK_OSTATUS;
                        }
                }
+               if (strstr($orig_version.$version, 'Pleroma')) {
+                       $platform = 'Pleroma';
+                       $version = trim(str_replace('Pleroma', '', $version));
+               }
        }
 
        if (!$failure) {
@@ -1169,7 +1174,9 @@ function poco_check_server($server_url, $network = "", $force = false) {
                                $version = $data->version;
                                $network = NETWORK_DIASPORA;
                        }
-                       $site_name = $data->site_name;
+                       if (!empty($data->site_name)) {
+                               $site_name = $data->site_name;
+                       }
                        switch ($data->register_policy) {
                                case "REGISTER_OPEN":
                                        $register_policy = REGISTER_OPEN;
@@ -1249,9 +1256,11 @@ function poco_check_server($server_url, $network = "", $force = false) {
                                $version = preg_replace("=(.+)-(.{4,})=ism", "$1", $version);
                        }
 
-                       $site_name = $data->name;
+                       if (!empty($data->name)) {
+                               $site_name = $data->name;
+                       }
 
-                       if (isset($data->network)) {
+                       if (!empty($data->network)) {
                                $platform = $data->network;
                        }
 
@@ -2192,22 +2201,14 @@ function update_gcontact($contact) {
                $contact["updated"] = dbm::date();
        }
 
-       if ($contact["server_url"] == "") {
-               $server_url = $contact["url"];
-
-               $server_url = matching_url($server_url, $contact["alias"]);
-               if ($server_url != "") {
-                       $contact["server_url"] = $server_url;
-               }
-
-               $server_url = matching_url($server_url, $contact["photo"]);
-               if ($server_url != "") {
-                       $contact["server_url"] = $server_url;
-               }
+       if ($contact["network"] == NETWORK_TWITTER) {
+               $contact["server_url"] = 'http://twitter.com';
+       }
 
-               $server_url = matching_url($server_url, $contact["notify"]);
-               if ($server_url != "") {
-                       $contact["server_url"] = $server_url;
+       if ($contact["server_url"] == "") {
+               $data = Probe::uri($contact["url"]);
+               if ($data["network"] != NETWORK_PHANTOM) {
+                       $contact["server_url"] = $data['baseurl'];
                }
        } else {
                $contact["server_url"] = normalise_link($contact["server_url"]);
@@ -2238,22 +2239,22 @@ function update_gcontact($contact) {
 
        if ($update) {
                logger("Update gcontact for ".$contact["url"], LOGGER_DEBUG);
-
-               q("UPDATE `gcontact` SET `photo` = '%s', `name` = '%s', `nick` = '%s', `addr` = '%s', `network` = '%s',
-                                       `birthday` = '%s', `gender` = '%s', `keywords` = '%s', `hide` = %d, `nsfw` = %d,
-                                       `contact-type` = %d, `alias` = '%s', `notify` = '%s', `url` = '%s',
-                                       `location` = '%s', `about` = '%s', `generation` = %d, `updated` = '%s',
-                                       `server_url` = '%s', `connect` = '%s'
-                               WHERE `nurl` = '%s' AND (`generation` = 0 OR `generation` >= %d)",
-                       dbesc($contact["photo"]), dbesc($contact["name"]), dbesc($contact["nick"]),
-                       dbesc($contact["addr"]), dbesc($contact["network"]), dbesc($contact["birthday"]),
-                       dbesc($contact["gender"]), dbesc($contact["keywords"]), intval($contact["hide"]),
-                       intval($contact["nsfw"]), intval($contact["contact-type"]), dbesc($contact["alias"]),
-                       dbesc($contact["notify"]), dbesc($contact["url"]), dbesc($contact["location"]),
-                       dbesc($contact["about"]), intval($contact["generation"]), dbesc(dbm::date($contact["updated"])),
-                       dbesc($contact["server_url"]), dbesc($contact["connect"]),
-                       dbesc(normalise_link($contact["url"])), intval($contact["generation"]));
-
+               $condition = array('`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)',
+                               normalise_link($contact["url"]), $contact["generation"]);
+               $contact["updated"] = dbm::date($contact["updated"]);
+
+               $updated = array('photo' => $contact['photo'], 'name' => $contact['name'],
+                               'nick' => $contact['nick'], 'addr' => $contact['addr'],
+                               'network' => $contact['network'], 'birthday' => $contact['birthday'],
+                               'gender' => $contact['gender'], 'keywords' => $contact['keywords'],
+                               'hide' => $contact['hide'], 'nsfw' => $contact['nsfw'],
+                               'contact-type' => $contact['contact-type'], 'alias' => $contact['alias'],
+                               'notify' => $contact['notify'], 'url' => $contact['url'],
+                               'location' => $contact['location'], 'about' => $contact['about'],
+                               'generation' => $contact['generation'], 'updated' => $contact['updated'],
+                               'server_url' => $contact['server_url'], 'connect' => $contact['connect']);
+
+               dba::update('gcontact', $updated, $condition, $fields);
 
                // Now update the contact entry with the user id "0" as well.
                // This is used for the shadow copies of public items.
@@ -2261,20 +2262,25 @@ function update_gcontact($contact) {
                        dbesc(normalise_link($contact["url"])));
 
                if (dbm::is_result($r)) {
-                       logger("Update shadow contact ".$r[0]["id"], LOGGER_DEBUG);
+                       logger("Update public contact ".$r[0]["id"], LOGGER_DEBUG);
 
                        update_contact_avatar($contact["photo"], 0, $r[0]["id"]);
 
-                       q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s',
-                                               `network` = '%s', `bd` = '%s', `gender` = '%s',
-                                               `keywords` = '%s', `alias` = '%s', `contact-type` = %d,
-                                               `url` = '%s', `location` = '%s', `about` = '%s'
-                                       WHERE `id` = %d",
-                               dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["addr"]),
-                               dbesc($contact["network"]), dbesc($contact["birthday"]), dbesc($contact["gender"]),
-                               dbesc($contact["keywords"]), dbesc($contact["alias"]), intval($contact["contact-type"]),
-                               dbesc($contact["url"]), dbesc($contact["location"]), dbesc($contact["about"]),
-                               intval($r[0]["id"]));
+                       $fields = array('name', 'nick', 'addr',
+                                       'network', 'bd', 'gender',
+                                       'keywords', 'alias', 'contact-type',
+                                       'url', 'location', 'about');
+                       $old_contact = dba::select('contact', $fields, array('id' => $r[0]["id"]), array('limit' => 1));
+
+                       // Update it with the current values
+                       $fields = array('name' => $contact['name'], 'nick' => $contact['nick'],
+                                       'addr' => $contact['addr'], 'network' => $contact['network'],
+                                       'bd' => $contact['birthday'], 'gender' => $contact['gender'],
+                                       'keywords' => $contact['keywords'], 'alias' => $contact['alias'],
+                                       'contact-type' => $contact['contact-type'], 'url' => $contact['url'],
+                                       'location' => $contact['location'], 'about' => $contact['about']);
+
+                       dba::update('contact', $fields, array('id' => $r[0]["id"]), $old_contact);
                }
        }