require('addon/pumpio/oauth/http.php');
require('addon/pumpio/oauth/oauth_client.php');
require_once('include/enotify.php');
+require_once('include/socgraph.php');
+require_once("include/Photo.php");
+require_once("mod/share.php");
define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes
$content = bbcode($b['body'], false, false, 4);
- // Enhance the way, videos are displayed
- $content = preg_replace('/<a href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n[url]$1[/url]\n",$content);
- $content = preg_replace('/<a href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
- $content = preg_replace('/<a href="(https?:\/\/vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
- $content = preg_replace('/<a href="(https?:\/\/player.vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
-
- $URLSearchString = "^\[\]";
- $content = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$content);
-
$params = array();
$params["verb"] = "post";
$_REQUEST["profile_uid"] = $uid;
$_REQUEST["source"] = "pump.io";
+ if (isset($post->object->id)) {
+ $_REQUEST['message_id'] = NETWORK_PUMPIO.":".$post->object->id;
+ }
+
if ($post->object->displayName != "")
$_REQUEST["title"] = html2bbcode($post->object->displayName);
else
logger("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
}
-function pumpio_get_contact($uid, $contact) {
+function pumpio_get_contact($uid, $contact, $no_insert = false) {
- if (function_exists("update_gcontact"))
+ if (function_exists("update_gcontact")) {
update_gcontact(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
"photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true,
"nick" => $contact->preferredUsername, "location" => $contact->location->displayName,
"about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)));
- else {
+
+ $cid = get_contact($contact->url, $uid);
+ } else {
// Old Code
$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
dbesc(normalise_link($contact->url)));
dbesc($contact->location->displayName),
dbesc($contact->summary),
dbesc(normalise_link($contact->url)));
+
+ $cid = 0;
}
+ if ($no_insert)
+ return($cid);
+
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
intval($uid), dbesc($contact->url));
group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
}
- require_once("Photo.php");
-
- $photos = import_profile_photo($contact->image->url,$uid,$contact_id);
-
- q("UPDATE `contact` SET `photo` = '%s',
- `thumb` = '%s',
- `micro` = '%s',
- `name-date` = '%s',
- `uri-date` = '%s',
- `avatar-date` = '%s'
- WHERE `id` = %d
- ",
- dbesc($photos[0]),
- dbesc($photos[1]),
- dbesc($photos[2]),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- intval($contact_id)
- );
-
if (DB_UPDATE_VERSION >= "1177")
q("UPDATE `contact` SET `location` = '%s',
`about` = '%s'
intval($contact_id)
);
} else {
- // update profile photos once every two weeks as we have no notification of when they change.
- //$update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -14 days')) ? true : false);
- $update_photo = ($r[0]['avatar-date'] < datetime_convert('','','now -12 hours'));
-
- // check that we have all the photos, this has been known to fail on occasion
-
- if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro']) || ($update_photo)) {
- require_once("Photo.php");
-
- $photos = import_profile_photo($contact->image->url, $uid, $r[0]['id']);
-
- q("UPDATE `contact` SET `photo` = '%s',
- `thumb` = '%s',
- `micro` = '%s',
- `name-date` = '%s',
- `uri-date` = '%s',
- `avatar-date` = '%s',
- `name` = '%s',
- `nick` = '%s'
- WHERE `id` = %d
- ",
- dbesc($photos[0]),
- dbesc($photos[1]),
- dbesc($photos[2]),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc($contact->displayName),
- dbesc($contact->preferredUsername),
- intval($r[0]['id'])
- );
+ $contact_id = $r[0]["id"];
- if (DB_UPDATE_VERSION >= "1177")
+ /* if (DB_UPDATE_VERSION >= "1177")
q("UPDATE `contact` SET `location` = '%s',
`about` = '%s'
WHERE `id` = %d",
dbesc($contact->summary),
intval($r[0]['id'])
);
- }
-
+ */
}
- return($r[0]["id"]);
+ if (function_exists("update_contact_avatar"))
+ update_contact_avatar($contact->image->url, $uid, $contact_id);
+
+ return($contact_id);
}
function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) {
$postarray['allow_cid'] = '<' . $self[0]['id'] . '>';
}
} else {
- $contact_id = 0;
+ $contact_id = pumpio_get_contact($uid, $post->actor, true);
- if(link_compare($post->actor->url, $own_id)) {
+ if (link_compare($post->actor->url, $own_id)) {
$contact_id = $self[0]['id'];
$post->actor->displayName = $self[0]['name'];
$post->actor->url = $self[0]['url'];
$post->actor->image->url = $self[0]['photo'];
- } else {
+ } elseif ($contact_id == 0) {
// Take an existing contact, the contact of the note or - as a fallback - the id of the user
$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
dbesc($post->actor->url),
$postarray['plink'] = $post->object->url;
$postarray['app'] = $post->generator->displayName;
$postarray['body'] = html2bbcode($post->object->content);
+ $postarray['object'] = json_encode($post);
if ($post->object->fullImage->url != "")
$postarray["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$postarray["body"];
$postarray['title'] = $post->object->displayName;
$postarray['created'] = datetime_convert('UTC','UTC',$post->published);
- $postarray['edited'] = datetime_convert('UTC','UTC',$post->received);
+ if (isset($post->updated))
+ $postarray['edited'] = datetime_convert('UTC','UTC',$post->updated);
+ elseif (isset($post->received))
+ $postarray['edited'] = datetime_convert('UTC','UTC',$post->received);
+ else
+ $postarray['edited'] = $postarray['created'];
if ($post->verb == "share") {
if (!intval(get_config('system','wall-to-wall_share'))) {
- $postarray['body'] = "[share author='".$post->object->author->displayName.
+ if (isset($post->object->author->displayName) AND ($post->object->author->displayName != ""))
+ $share_author = $post->object->author->displayName;
+ elseif (isset($post->object->author->preferredUsername) AND ($post->object->author->preferredUsername != ""))
+ $share_author = $post->object->author->preferredUsername;
+ else
+ $share_author = $post->object->author->url;
+
+ $postarray['body'] = share_header($share_author, $post->object->author->url,
+ $post->object->author->image->url, "",
+ datetime_convert('UTC','UTC',$post->object->created),
+ $post->links->self->href).
+ $postarray['body']."[/share]";
+
+ /*
+ $postarray['body'] = "[share author='".$share_author.
"' profile='".$post->object->author->url.
"' avatar='".$post->object->author->image->url.
"' posted='".datetime_convert('UTC','UTC',$post->object->created).
"' link='".$post->links->self->href."']".$postarray['body']."[/share]";
+ */
} else {
// Let shares look like wall-to-wall posts
$postarray['author-name'] = $post->object->author->displayName;
$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($uid));
- $lastitems = q("SELECT uri FROM `item` WHERE `network` = '%s' AND `uid` = %d AND
- `extid` != '' AND `id` = `parent`
- ORDER BY `commented` DESC LIMIT 10",
+ $lastitems = q("SELECT `uri` FROM `thread`
+ INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
+ WHERE `thread`.`network` = '%s' AND `thread`.`uid` = %d AND `item`.`extid` != ''
+ ORDER BY `thread`.`commented` DESC LIMIT 10",
dbesc(NETWORK_PUMPIO),
intval($uid)
);
projects / friendica-addons.git / blobdiff