X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=pumpio%2Fpumpio.php;h=65f55552573b79c0e09e228000530bc5e9516e6e;hb=ad46da0669ceb459d2bbdcb336bf6f6300a178b9;hp=1702971ce87dae29207a97e9bc7cc3cac2e30ffd;hpb=f0310f62758de957592c513473ac535c6e04f00c;p=friendica-addons.git

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 1702971c..65f55552 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -8,6 +8,9 @@
 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
 
@@ -449,15 +452,6 @@ function pumpio_send(&$a,&$b) {
 
 		$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";
@@ -781,6 +775,10 @@ function pumpio_fetchtimeline(&$a, $uid) {
 				$_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
@@ -837,8 +835,8 @@ function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) {
 	if(link_compare($post->actor->url, $own_id)) {
 		$contactid = $self[0]['id'];
 	} else {
-		$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
-			dbesc($post->actor->url),
+		$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+			dbesc(normalise_link($post->actor->url)),
 			intval($uid)
 		);
 
@@ -866,6 +864,11 @@ function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) {
 function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = true) {
 	require_once('include/items.php');
 
+	if ($post->object->id == "") {
+		logger('Got empty like: '.print_r($post, true), LOGGER_DEBUG);
+		return;
+	}
+
 	// Searching for the liked post
 	// Two queries for speed issues
 	$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1",
@@ -901,8 +904,8 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
 		$post->actor->url = $self[0]['url'];
 		$post->actor->image->url = $self[0]['photo'];
 	} else {
-		$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
-			dbesc($post->actor->url),
+		$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+			dbesc(normalise_link($post->actor->url)),
 			intval($uid)
 		);
 
@@ -955,47 +958,26 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
 	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"))
-		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 {
-		// Old Code
-		$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)));
-
-		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)));
-	}
+	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)));
+	$cid = get_contact($contact->url, $uid);
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
-		intval($uid), dbesc($contact->url));
+	if ($no_insert)
+		return($cid);
 
-	if(!count($r)) {
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
+		intval($uid), dbesc(normalise_link($contact->url)));
+
+	if (!count($r)) {
 		// create contact record
-		q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
+		q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
 					`name`, `nick`, `photo`, `network`, `rel`, `priority`,
 					`writable`, `blocked`, `readonly`, `pending` )
-				VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+				VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0)",
 			intval($uid),
 			dbesc(datetime_convert()),
 			dbesc($contact->url),
@@ -1013,15 +995,16 @@ function pumpio_get_contact($uid, $contact) {
 			intval(1)
 		);
 
-		$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
-			dbesc($contact->url),
+		$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
+			dbesc(normalise_link($contact->url)),
 			intval($uid)
 			);
 
-		if(! count($r))
+		if (!count($r)) {
 			return(false);
+		}
 
-		$contact_id  = $r[0]['id'];
+		$contact_id = $r[0]['id'];
 
 		$g = q("select def_gid from user where uid = %d limit 1",
 			intval($uid)
@@ -1032,27 +1015,6 @@ function pumpio_get_contact($uid, $contact) {
 			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'
@@ -1062,39 +1024,9 @@ function pumpio_get_contact($uid, $contact) {
 				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",
@@ -1102,11 +1034,13 @@ function pumpio_get_contact($uid, $contact) {
 					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) {
@@ -1198,25 +1132,25 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 			$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),
+			$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+				dbesc(normalise_link($post->actor->url)),
 				intval($uid)
 			);
 
 			if(count($r))
 				$contact_id = $r[0]['id'];
 			else {
-				$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
-					dbesc($post->actor->url),
+				$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+					dbesc(normalise_link($post->actor->url)),
 					intval($uid)
 				);
 
@@ -1261,6 +1195,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 	$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"];
@@ -1269,15 +1204,35 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 		$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;
@@ -1379,9 +1334,10 @@ function pumpio_fetchinbox(&$a, $uid) {
 	$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)
 			);