friendica/friendica-addons
7
2
Fork 13
Code Issues 3 Pull requests 2 Releases 16 Wiki Activity

Updated function call for updating the global contacts.

Browse source
This commit is contained in:
Michael Vogel 2016-01-06 15:10:22 +01:00
parent 3b54203d80
commit bed435d76a
4 changed files with 109 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
appnet/appnet.php
View file

@ -1098,35 +1098,35 @@ function appnet_expand_annotations($a, $annotations) {
function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) { function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
if (function_exists("update_gcontact")) if (function_exists("update_gcontact"))
update_gcontact($contact["canonical_url"], update_gcontact(array("url" => $contact["canonical_url"], "generation" => 2,
NETWORK_APPNET, $contact["avatar_image"]["url"], "network" => NETWORK_APPNET, "photo" => $contact["avatar_image"]["url"],
$contact["name"], $contact["username"], "name" => $contact["name"], "nick" => $contact["username"],
"", $contact["description"]["text"], "about" => $contact["description"]["text"], "hide" => true,
$contact["username"]."@app.net"); "addr" => $contact["username"]."@app.net"));
else {
// Old Code
$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
dbesc(normalise_link($contact["canonical_url"])));
// Old Code if (count($r) == 0)
$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
dbesc(normalise_link($contact["canonical_url"]))); dbesc(normalise_link($contact["canonical_url"])),
dbesc($contact["name"]),
if (count($r) == 0) dbesc($contact["username"]),
q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')", dbesc($contact["avatar_image"]["url"]));
dbesc(normalise_link($contact["canonical_url"])), else
dbesc($contact["name"]), q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
dbesc($contact["username"]), dbesc($contact["name"]),
dbesc($contact["avatar_image"]["url"])); dbesc($contact["username"]),
else dbesc($contact["avatar_image"]["url"]),
q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'", dbesc(normalise_link($contact["canonical_url"])));
dbesc($contact["name"]),
dbesc($contact["username"]),
dbesc($contact["avatar_image"]["url"]),
dbesc(normalise_link($contact["canonical_url"])));
if (DB_UPDATE_VERSION >= "1177")
q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
dbesc(""),
dbesc($contact["description"]["text"]),
dbesc(normalise_link($contact["canonical_url"])));
if (DB_UPDATE_VERSION >= "1177")
q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
dbesc(""),
dbesc($contact["description"]["text"]),
dbesc(normalise_link($contact["canonical_url"])));
}
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
intval($uid), dbesc("adn::".$contact["id"])); intval($uid), dbesc("adn::".$contact["id"]));

51
pumpio/pumpio.php
View file

@ -945,33 +945,34 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
function pumpio_get_contact($uid, $contact) { function pumpio_get_contact($uid, $contact) {
if (function_exists("update_gcontact")) if (function_exists("update_gcontact"))
update_gcontact($contact->url, update_gcontact(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
NETWORK_PUMPIO, $contact->image->url, "photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true,
$contact->displayName, $contact->preferredUsername, "nick" => $contact->preferredUsername, "location" => $contact->location->displayName,
$contact->location->displayName, $contact->summary, "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)));
str_replace("acct:", "", $contact->id)); else {
// Old Code
$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
dbesc(normalise_link($contact->url)));
if (count($r) == 0)
q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
dbesc(normalise_link($contact->url)),
dbesc($contact->displayName),
dbesc($contact->preferredUsername),
dbesc($contact->image->url));
else
q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
dbesc($contact->displayName),
dbesc($contact->preferredUsername),
dbesc($contact->image->url),
dbesc(normalise_link($contact->url))); dbesc(normalise_link($contact->url)));
if (DB_UPDATE_VERSION >= "1177") if (count($r) == 0)
q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'", q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
dbesc($contact->location->displayName), dbesc(normalise_link($contact->url)),
dbesc($contact->summary), dbesc($contact->displayName),
dbesc(normalise_link($contact->url))); dbesc($contact->preferredUsername),
dbesc($contact->image->url));
else
q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
dbesc($contact->displayName),
dbesc($contact->preferredUsername),
dbesc($contact->image->url),
dbesc(normalise_link($contact->url)));
if (DB_UPDATE_VERSION >= "1177")
q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
dbesc($contact->location->displayName),
dbesc($contact->summary),
dbesc(normalise_link($contact->url)));
}
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
intval($uid), dbesc($contact->url)); intval($uid), dbesc($contact->url));

54
statusnet/statusnet.php
View file

@ -909,35 +909,35 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
return(-1); return(-1);
if (function_exists("update_gcontact")) if (function_exists("update_gcontact"))
update_gcontact($contact->statusnet_profile_url, update_gcontact(array("url" => $contact->statusnet_profile_url,
NETWORK_STATUSNET, $contact->profile_image_url, "network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url,
$contact->name, $contact->screen_name, "name" => $contact->name, "nick" => $contact->screen_name,
$contact->location, $contact->description, "location" => $contact->location, "about" => $contact->description,
statusnet_address($contact)); "addr" => statusnet_address($contact), "generation" => 3));
else {
// Old Code
$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
dbesc(normalise_link($contact->statusnet_profile_url)));
// Check if the unique contact is existing if (count($r) == 0)
// To-Do: only update once a while q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", dbesc(normalise_link($contact->statusnet_profile_url)),
dbesc(normalise_link($contact->statusnet_profile_url))); dbesc($contact->name),
dbesc($contact->screen_name),
dbesc($contact->profile_image_url));
else
q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
dbesc($contact->name),
dbesc($contact->screen_name),
dbesc($contact->profile_image_url),
dbesc(normalise_link($contact->statusnet_profile_url)));
if (count($r) == 0) if (DB_UPDATE_VERSION >= "1177")
q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')", q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
dbesc(normalise_link($contact->statusnet_profile_url)), dbesc($contact->location),
dbesc($contact->name), dbesc($contact->description),
dbesc($contact->screen_name), dbesc(normalise_link($contact->statusnet_profile_url)));
dbesc($contact->profile_image_url)); }
else
q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
dbesc($contact->name),
dbesc($contact->screen_name),
dbesc($contact->profile_image_url),
dbesc(normalise_link($contact->statusnet_profile_url)));
if (DB_UPDATE_VERSION >= "1177")
q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
dbesc($contact->location),
dbesc($contact->description),
dbesc(normalise_link($contact->statusnet_profile_url)));
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1",
intval($uid), dbesc(normalise_link($contact->statusnet_profile_url)), dbesc(NETWORK_STATUSNET)); intval($uid), dbesc(normalise_link($contact->statusnet_profile_url)), dbesc(NETWORK_STATUSNET));

64
twitter/twitter.php
View file

@ -926,6 +926,8 @@ function twitter_queue_hook(&$a,&$b) {
} }
function twitter_fix_avatar($avatar) { function twitter_fix_avatar($avatar) {
require_once("include/Photo.php");
$new_avatar = str_replace("_normal.", ".", $avatar); $new_avatar = str_replace("_normal.", ".", $avatar);
$info = get_photo_info($new_avatar); $info = get_photo_info($new_avatar);
@ -936,50 +938,42 @@ function twitter_fix_avatar($avatar) {
} }
function twitter_fetch_contact($uid, $contact, $create_user) { function twitter_fetch_contact($uid, $contact, $create_user) {
require_once("include/Photo.php");
if ($contact->id_str == "") if ($contact->id_str == "")
return(-1); return(-1);
$avatar = twitter_fix_avatar($contact->profile_image_url_https); $avatar = twitter_fix_avatar($contact->profile_image_url_https);
//$avatar = str_replace("_normal.", ".", $contact->profile_image_url_https);
//$info = get_photo_info($avatar);
//if (!$info)
// $avatar = $contact->profile_image_url_https;
if (function_exists("update_gcontact")) if (function_exists("update_gcontact"))
update_gcontact("https://twitter.com/".$contact->screen_name, update_gcontact(array("url" => "https://twitter.com/".$contact->screen_name,
NETWORK_TWITTER, $avatar, "network" => NETWORK_TWITTER, "photo" => $avatar, "hide" => true,
$contact->name, $contact->screen_name, "name" => $contact->name, "nick" => $contact->screen_name,
$contact->location, $contact->description, "location" => $contact->location, "about" => $contact->description,
$contact->screen_name."@twitter.com"); "addr" => $contact->screen_name."@twitter.com", "generation" => 2));
else {
// Old Code
$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
// Old stuff - will be removed later if (count($r) == 0)
// Check if the unique contact is existing q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
// To-Do: only update once a while dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", dbesc($contact->name),
dbesc(normalise_link("https://twitter.com/".$contact->screen_name))); dbesc($contact->screen_name),
dbesc($avatar));
else
q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
dbesc($contact->name),
dbesc($contact->screen_name),
dbesc($avatar),
dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
if (count($r) == 0) if (DB_UPDATE_VERSION >= "1177")
q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')", q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
dbesc(normalise_link("https://twitter.com/".$contact->screen_name)), dbesc($contact->location),
dbesc($contact->name), dbesc($contact->description),
dbesc($contact->screen_name), dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
dbesc($avatar)); }
else
q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
dbesc($contact->name),
dbesc($contact->screen_name),
dbesc($avatar),
dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
if (DB_UPDATE_VERSION >= "1177")
q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
dbesc($contact->location),
dbesc($contact->description),
dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
intval($uid), dbesc("twitter::".$contact->id_str)); intval($uid), dbesc("twitter::".$contact->id_str));