From 029726c1dfea731d5eb8a0b38db67f831aba1c69 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 10 Nov 2014 23:00:39 +0100 Subject: [PATCH] pumpio: Threads should be now more complete than before. (Due to some flaws in the pumpio-api htere were mostly missing some comments) --- pumpio/pumpio.php | 101 +++++++++++++++++++++++++++++----------------- 1 file changed, 64 insertions(+), 37 deletions(-) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 55d0433a..48dbab74 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -433,8 +433,8 @@ function pumpio_send(&$a,&$b) { $title = trim($b['title']); - if ($title != '') - $title = "

".$title."

"; + //if ($title != '') + // $title = "

".$title."

"; $content = bbcode($b['body'], false, false, 4); @@ -454,7 +454,10 @@ function pumpio_send(&$a,&$b) { if (!$iscomment) { $params["object"] = array( 'objectType' => "note", - 'content' => $title.$content); + 'content' => $content); + + if ($title != "") + $params["object"]["displayName"] = $title; if (count($receiver["to"])) $params["to"] = $receiver["to"]; @@ -477,8 +480,11 @@ function pumpio_send(&$a,&$b) { $params["object"] = array( 'objectType' => "comment", - 'content' => $title.$content, + 'content' => $content, 'inReplyTo' => $inReplyTo); + + if ($title != "") + $params["object"]["displayName"] = $title; } $client = new oauth_client_class; @@ -805,7 +811,8 @@ function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) { logger("pumpio_dounlike: not found. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); } -function pumpio_dolike(&$a, $uid, $self, $post, $own_id) { +function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = true) { + require_once('include/items.php'); // Searching for the liked post // Two queries for speed issues @@ -828,6 +835,10 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id) { $orig_post = $r[0]; } + // thread completion + if ($threadcompletion) + pumpio_fetchallcomments($a, $uid, $post->object->id); + $contactid = 0; if(link_compare($post->actor->url, $own_id)) { @@ -1032,7 +1043,7 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) { return drop_item($r[0]["id"], $false); } -function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = false) { +function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = true) { require_once('include/items.php'); require_once('include/html2bbcode.php'); @@ -1094,6 +1105,11 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $contact_id = $self[0]['id']; $postarray['parent-uri'] = $post->object->id; + + if (!$public) { + $postarray['private'] = 1; + $postarray['allow_cid'] = '<' . $self[0]['id'] . '>'; + } } else { $contact_id = 0; @@ -1139,7 +1155,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $reply->published = $post->object->inReplyTo->published; $reply->received = $post->object->inReplyTo->updated; $reply->url = $post->object->inReplyTo->url; - pumpio_dopost($a, $client, $uid, $self, $reply, $own_id); + pumpio_dopost($a, $client, $uid, $self, $reply, $own_id, false); $postarray['parent-uri'] = $post->object->inReplyTo->id; } @@ -1167,10 +1183,6 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $postarray['created'] = datetime_convert('UTC','UTC',$post->published); $postarray['edited'] = datetime_convert('UTC','UTC',$post->received); - if (!$public) { - $postarray['private'] = 1; - $postarray['allow_cid'] = '<' . $self[0]['id'] . '>'; - } if ($post->verb == "share") { if (!intval(get_config('system','wall-to-wall_share'))) { @@ -1276,6 +1288,13 @@ 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", + dbesc(NETWORK_PUMPIO), + intval($uid) + ); + $client = new oauth_client_class; $client->oauth_version = '1.0a'; $client->authorization_header = true; @@ -1301,10 +1320,13 @@ function pumpio_fetchinbox(&$a, $uid) { if (count($posts)) foreach ($posts as $post) { $last_id = $post->id; - pumpio_dopost($a, $client, $uid, $self, $post, $own_id); + pumpio_dopost($a, $client, $uid, $self, $post, $own_id, true); } } + foreach ($lastitems AS $item) + pumpio_fetchallcomments($a, $uid, $item["uri"]); + set_pconfig($uid,'pumpio','last_id', $last_id); } @@ -1512,33 +1534,23 @@ function pumpio_fetchallcomments(&$a, $uid, $id) { $hostname = get_pconfig($uid, 'pumpio','host'); $username = get_pconfig($uid, "pumpio", "user"); - $own_id = "https://".$hostname."/".$username; + logger("pumpio_fetchallcomments: completing comment for user ".$uid." post id ".$id); - logger("pumpio_fetchallcomments: completing comment for user ".$uid." url ".$url); + $own_id = "https://".$hostname."/".$username; $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", intval($uid)); - // Fetching the original post - Two queries for speed issues - $r = q("SELECT extid FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($url), + // Fetching the original post + $r = q("SELECT `extid` FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `extid` != '' LIMIT 1", + dbesc($id), intval($uid) ); - if (!count($r)) { - $r = q("SELECT extid FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", - dbesc($url), - intval($uid) - ); + if (!count($r)) + return false; - if (!count($r)) - return false; - } - - if ($r[0]["extid"]) - $url = $r[0]["extid"]; - else - $url = $id; + $url = $r[0]["extid"]; $client = new oauth_client_class; $client->oauth_version = '1.0a'; @@ -1557,6 +1569,22 @@ function pumpio_fetchallcomments(&$a, $uid, $id) { if (!$success) return; + if ($item->likes->totalItems != 0) { + foreach ($item->likes->items AS $post) { + $like = new stdClass; + $like->object = new stdClass; + $like->object->id = $item->id; + $like->actor = new stdClass; + $like->actor->displayName = $item->displayName; + $like->actor->preferredUsername = $item->preferredUsername; + $like->actor->url = $item->url; + $like->actor->image = $item->image; + $like->generator = new stdClass; + $like->generator->displayName = "pumpio"; + pumpio_dolike($a, $uid, $self, $post, $own_id, false); + } + } + if ($item->replies->totalItems == 0) return; @@ -1566,7 +1594,7 @@ function pumpio_fetchallcomments(&$a, $uid, $id) { // Checking if the comment already exists - Two queries for speed issues $r = q("SELECT extid FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($url), + dbesc($item->id), intval($uid) ); @@ -1574,18 +1602,21 @@ function pumpio_fetchallcomments(&$a, $uid, $id) { continue; $r = q("SELECT extid FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", - dbesc($url), + dbesc($item->id), intval($uid) ); if (count($r)) continue; + $post = new stdClass; $post->verb = "post"; $post->actor = $item->author; $post->published = $item->published; $post->received = $item->updated; + $post->generator = new stdClass; $post->generator->displayName = "pumpio"; + // To-Do: Check for public post unset($item->author); unset($item->published); @@ -1593,17 +1624,13 @@ function pumpio_fetchallcomments(&$a, $uid, $id) { $post->object = $item; - logger("pumpio_fetchallcomments: posting comment ".$post->object->id); + logger("pumpio_fetchallcomments: posting comment ".$post->object->id." ".print_r($post, true)); pumpio_dopost($a, $client, $uid, $self, $post, $own_id, false); } } /* -Bugs: - - refresh after post doesn't always happen - To-Do: - edit own notes - delete own notes - */