Friendica/friendica-addons
1
1
Fork 1
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2024-12-22 05:20:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

The gcontact table will now be filled instead of the unique_contacts

Browse source
This commit is contained in:
Michael Vogel 2016-01-05 15:35:49 +01:00
parent 5270552a08
commit 3b54203d80
5 changed files with 51 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
appnet/appnet.php
View file

@ -1097,6 +1097,14 @@ function appnet_expand_annotations($a, $annotations) {
function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
if (function_exists("update_gcontact"))
update_gcontact($contact["canonical_url"],
NETWORK_APPNET, $contact["avatar_image"]["url"],
$contact["name"], $contact["username"],
"", $contact["description"]["text"],
$contact["username"]."@app.net");
// Old Code
$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
dbesc(normalise_link($contact["canonical_url"])));

1
buffer/buffer.php
View file

@ -377,6 +377,7 @@ function buffer_send(&$a,&$b) {
$message["media[thumbnail]"] = $post["preview"];
//print_r($message);
logger("buffer_send: data for message ".$b["id"].": ".print_r($message, true), LOGGER_DEBUG);
$ret = $buffer->go('/updates/create', $message);
logger("buffer_send: send message ".$b["id"]." result: ".print_r($ret, true), LOGGER_DEBUG);
}

7
pumpio/pumpio.php
View file

@ -944,6 +944,13 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
function pumpio_get_contact($uid, $contact) {
if (function_exists("update_gcontact"))
update_gcontact($contact->url,
NETWORK_PUMPIO, $contact->image->url,
$contact->displayName, $contact->preferredUsername,
$contact->location->displayName, $contact->summary,
str_replace("acct:", "", $contact->id));
$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
dbesc(normalise_link($contact->url)));

7
statusnet/statusnet.php
View file

@ -908,6 +908,13 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
if ($contact->statusnet_profile_url == "")
return(-1);
if (function_exists("update_gcontact"))
update_gcontact($contact->statusnet_profile_url,
NETWORK_STATUSNET, $contact->profile_image_url,
$contact->name, $contact->screen_name,
$contact->location, $contact->description,
statusnet_address($contact));
// Check if the unique contact is existing
// To-Do: only update once a while
$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",

34
twitter/twitter.php
View file

@ -925,18 +925,38 @@ function twitter_queue_hook(&$a,&$b) {
}
}
function twitter_fix_avatar($avatar) {
$new_avatar = str_replace("_normal.", ".", $avatar);
$info = get_photo_info($new_avatar);
if (!$info)
$new_avatar = $avatar;
return $new_avatar;
}
function twitter_fetch_contact($uid, $contact, $create_user) {
require_once("include/Photo.php");
if ($contact->id_str == "")
return(-1);
$avatar = str_replace("_normal.", ".", $contact->profile_image_url_https);
$avatar = twitter_fix_avatar($contact->profile_image_url_https);
$info = get_photo_info($avatar);
if (!$info)
$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"))
update_gcontact("https://twitter.com/".$contact->screen_name,
NETWORK_TWITTER, $avatar,
$contact->name, $contact->screen_name,
$contact->location, $contact->description,
$contact->screen_name."@twitter.com");
// Old stuff - will be removed later
// Check if the unique contact is existing
// To-Do: only update once a while
$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
@ -1220,6 +1240,8 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
if (($footer == "") AND ($picture != ""))
$body .= "\n\n[img]".$picture."[/img]\n";
elseif (($footer == "") AND ($picture == ""))
$body = add_page_info_to_body($body);
if ($no_tags)
return(array("body" => $body, "tags" => ""));
@ -1360,7 +1382,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
$postarray['owner-name'] = $post->user->name;
$postarray['owner-link'] = "https://twitter.com/".$post->user->screen_name;
$postarray['owner-avatar'] = $post->user->profile_image_url_https;
$postarray['owner-avatar'] = twitter_fix_avatar($post->user->profile_image_url_https);
}
if(($contactid == 0) AND !$only_existing_contact)
@ -1464,7 +1486,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
// Let retweets look like wall-to-wall posts
$postarray['author-name'] = $post->retweeted_status->user->name;
$postarray['author-link'] = "https://twitter.com/".$post->retweeted_status->user->screen_name;
$postarray['author-avatar'] = $post->retweeted_status->user->profile_image_url_https;
$postarray['author-avatar'] = twitter_fix_avatar($post->retweeted_status->user->profile_image_url_https);
//if (($post->retweeted_status->user->screen_name != "") AND ($post->retweeted_status->id_str != "")) {
// $postarray['plink'] = "https://twitter.com/".$post->retweeted_status->user->screen_name."/status/".$post->retweeted_status->id_str;
// $postarray['uri'] = "twitter::".$post->retweeted_status->id_str;