X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=fromgplus%2Ffromgplus.php;h=933567ce7c07f5a9a788fd95292d25f8747076d4;hb=2d6c2989f7dbb53cd6db0b0e114b83de0378451f;hp=7b25fd3d219eade5bff72f7bc3884162141fafcf;hpb=2ca92ed594ba3909fdcc063b2b63e27620841336;p=friendica-addons.git diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php index 7b25fd3d..933567ce 100644 --- a/fromgplus/fromgplus.php +++ b/fromgplus/fromgplus.php @@ -9,6 +9,8 @@ define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes +require_once('mod/share.php'); + function fromgplus_install() { register_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings'); register_hook('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post'); @@ -71,6 +73,10 @@ function fromgplus_addon_settings_post(&$a,&$b) { set_pconfig(local_user(),'fromgplus','account',trim($_POST['fromgplus-account'])); $enable = ((x($_POST,'fromgplus-enable')) ? intval($_POST['fromgplus-enable']) : 0); set_pconfig(local_user(),'fromgplus','enable', $enable); + + if (!$enable) + del_pconfig(local_user(),'fromgplus','lastdate'); + info( t('Google+ Import Settings saved.') . EOL); } } @@ -134,6 +140,7 @@ function fromgplus_post($a, $uid, $source, $body, $location) { $_REQUEST['profile_uid'] = $uid; $_REQUEST['source'] = $source; + $_REQUEST['extid'] = NETWORK_GPLUS; // $_REQUEST['verb'] // $_REQUEST['parent'] @@ -191,14 +198,15 @@ function fromgplus_parse_query($var) } function fromgplus_cleanupgoogleproxy($fullImage, $image) { + //$preview = "/w".$fullImage->width."-h".$fullImage->height."/"; + //$preview2 = "/w".$fullImage->width."-h".$fullImage->height."-p/"; + //$fullImage = str_replace(array($preview, $preview2), array("/", "/"), $fullImage->url); + $fullImage = $fullImage->url; - $preview = "/w".$fullImage->width."-h".$fullImage->height."/"; - $preview2 = "/w".$fullImage->width."-h".$fullImage->height."-p/"; - $fullImage = str_replace(array($preview, $preview2), array("/", "/"), $fullImage->url); - - $preview = "/w".$image->width."-h".$image->height."/"; - $preview2 = "/w".$image->width."-h".$image->height."-p/"; - $image = str_replace(array($preview, $preview2), array("/", "/"), $image->url); + //$preview = "/w".$image->width."-h".$image->height."/"; + //$preview2 = "/w".$image->width."-h".$image->height."-p/"; + //$image = str_replace(array($preview, $preview2), array("/", "/"), $image->url); + $image = $image->url; $cleaned = array(); @@ -223,7 +231,23 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) { $cleaned["preview"] = ""; } - if ($cleaned["full"] == $cleaned["preview"]) + if ($cleaned["full"] != "") + $infoFull = get_photo_info($cleaned["full"]); + else + $infoFull = array("0" => 0, "1" => 0); + + if ($cleaned["preview"] != "") + $infoPreview = get_photo_info($cleaned["preview"]); + else + $infoFull = array("0" => 0, "1" => 0); + + if (($infoPreview[0] >= $infoFull[0]) AND ($infoPreview[1] >= $infoFull[1])) { + $temp = $cleaned["full"]; + $cleaned["full"] = $cleaned["preview"]; + $cleaned["preview"] = $temp; + } + + if (($cleaned["full"] == $cleaned["preview"]) OR (($infoPreview[0] == $infoFull[0]) AND ($infoPreview[1] == $infoFull[1]))) $cleaned["preview"] = ""; if ($cleaned["full"] == "") @@ -232,7 +256,10 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) { if ($cleaned["full"] == "") if (@exif_imagetype($image) != 0) - $cleaned["full"] = $fullImage; + $cleaned["full"] = $image; + + // Could be changed in the future to a link to the album + $cleaned["page"] = $cleaned["full"]; return($cleaned); } @@ -243,87 +270,123 @@ function fromgplus_cleantext($text) { $trash = html_entity_decode("", ENT_QUOTES, 'UTF-8'); $text = strip_tags($text); - $text = html_entity_decode($text); + $text = html_entity_decode($text, ENT_QUOTES); $text = trim($text); $text = str_replace(array("\n", "\r", " ", $trash), array("", "", "", ""), $text); return($text); } -function fromgplus_handleattachments($item, $displaytext) { +function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) { + require_once("include/Photo.php"); + require_once("include/items.php"); + require_once("include/network.php"); + $post = ""; $quote = ""; - $type = ""; + $pagedata = array(); + $pagedata["type"] = ""; foreach ($item->object->attachments as $attachment) { switch($attachment->objectType) { case "video": - $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n"; - - /*$images = cleanupgoogleproxy($attachment->fullImage, $attachment->image); - if ($images["preview"] != "") - $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n"; - elseif ($images["full"] != "") - $post .= "\n[img]".$images["full"]."[/img]\n";*/ - + $pagedata["type"] = "video"; + $pagedata["url"] = original_url($attachment->url); + $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); break; case "article": - $post .= "\n[class=type-link][bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n"; + $pagedata["type"] = "link"; + $pagedata["url"] = original_url($attachment->url); + $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image); - //if ($images["preview"] != "") - // $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n"; - //elseif ($images["full"] != "") - // $post .= "\n[img]".$images["full"]."[/img]\n"; if ($images["full"] != "") - $post .= "\n[img]".$images["full"]."[/img]"; + $pagedata["images"][0]["src"] = $images["full"]; - //$post .= "[quote]".trim(fromgplus_html2bbcode($attachment->content))."[/quote]"; $quote = trim(fromgplus_html2bbcode($attachment->content)); + if ($quote != "") - $quote = "\n[quote]".$quote."[/quote]"; + $pagedata["text"] = $quote; - $quote .= "[/class]"; break; case "photo": - $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image); - if ($images["preview"] != "") - $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n"; - elseif ($images["full"] != "") + // Don't store shared pictures in your wall photos (to prevent a possible violating of licenses) + if ($shared) + $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image); + else { + if ($attachment->fullImage->url != "") + $images = store_photo($a, $uid, "", $attachment->fullImage->url); + elseif ($attachment->image->url != "") + $images = store_photo($a, $uid, "", $attachment->image->url); + } + + if ($images["preview"] != "") { + $post .= "\n[url=".$images["page"]."][img]".$images["preview"]."[/img][/url]\n"; + $pagedata["images"][0]["src"] = $images["preview"]; + $pagedata["url"] = $images["page"]; + } elseif ($images["full"] != "") { $post .= "\n[img]".$images["full"]."[/img]\n"; + $pagedata["images"][0]["src"] = $images["full"]; + + if ($images["preview"] != "") + $pagedata["images"][1]["src"] = $images["preview"]; + } - if (($attachment->displayName != "") AND (fromgplus_cleantext($attachment->displayName) != fromgplus_cleantext($displaytext))) + if (($attachment->displayName != "") AND (fromgplus_cleantext($attachment->displayName) != fromgplus_cleantext($displaytext))) { $post .= fromgplus_html2bbcode($attachment->displayName)."\n"; + $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); + } break; case "photo-album": - $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n"; + $pagedata["url"] = original_url($attachment->url); + $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); + $post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n"; $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image); - if ($images["preview"] != "") + + if ($images["preview"] != "") { $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n"; - elseif ($images["full"] != "") + $pagedata["images"][0]["src"] = $images["preview"]; + $pagedata["url"] = $images["full"]; + } elseif ($images["full"] != "") { $post .= "\n[img]".$images["full"]."[/img]\n"; + $pagedata["images"][0]["src"] = $images["full"]; + if ($images["preview"] != "") + $pagedata["images"][1]["src"] = $images["preview"]; + } break; case "album": - foreach($attachment->thumbnails as $thumb) { - $preview = "/w".$thumb->image->width."-h".$thumb->image->height."/"; - $preview2 = "/w".$thumb->image->width."-h".$thumb->image->height."-p/"; - $image = str_replace(array($preview, $preview2), array("/", "/"), $thumb->image->url); + $pagedata["type"] = "link"; + $pagedata["url"] = original_url($attachment->url); + $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); + + $thumb = $attachment->thumbnails[0]; + $pagedata["images"][0]["src"] = $thumb->image->url; + + $quote = trim(fromgplus_html2bbcode($thumb->description)); + if ($quote != "") + $pagedata["text"] = $quote; - $post .= "\n[url=".$thumb->url."][img]".$image."[/img][/url]\n"; - } break; + case "audio": - $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n"; + $pagedata["url"] = original_url($attachment->url); + $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); + $post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n"; break; + //default: // die($attachment->objectType); } } + + if ($pagedata["type"] != "") + return(add_page_info_data($pagedata)); + return($post.$quote); } @@ -338,6 +401,7 @@ function fromgplus_fetch($a, $uid) { $result = fetch_url("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch); //$result = file_get_contents("google.txt"); + //$result = file_get_contents("addon/fromgplus/album.txt"); //file_put_contents("google.txt", $result); $activities = json_decode($result); @@ -354,23 +418,27 @@ function fromgplus_fetch($a, $uid) { $reversed = array_reverse($activities->items); foreach($reversed as $item) { + if (strtotime($item->published) <= $initiallastdate) continue; + // Don't publish items that are too young + if (strtotime($item->published) > (time() - 3*60)) { + logger('fromgplus_fetch: item too new '.$item->published); + continue; + } + if ($lastdate < strtotime($item->published)) $lastdate = strtotime($item->published); if ($first_time) continue; - if ($item->access->description == "Public") - - // Loop prevention - ignore postings from HootSuite - if ($item->provider->title == "HootSuite") - continue; + if ($item->access->description == "Public") { // Loop prevention through the special blank from the googleplus connector - if (strstr($item->object->content, $blank)) + //if (strstr($item->object->content, $blank)) + if (strrpos($item->object->content, $blank) >= strlen($item->object->content) - 5) continue; switch($item->object->objectType) { @@ -378,7 +446,7 @@ function fromgplus_fetch($a, $uid) { $post = fromgplus_html2bbcode($item->object->content); if (is_array($item->object->attachments)) - $post .= fromgplus_handleattachments($item, $item->object->content); + $post .= fromgplus_handleattachments($a, $uid, $item, $item->object->content, false); // geocode, placeName if (isset($item->address)) @@ -386,8 +454,8 @@ function fromgplus_fetch($a, $uid) { else $location = ""; - fromgplus_post($a, $uid, "Google+", $post, $location); - //fromgplus_post($a, $uid, $item->provider->title, $post, $location); + //fromgplus_post($a, $uid, "Google+", $post, $location); + fromgplus_post($a, $uid, $item->provider->title, $post, $location); break; @@ -395,15 +463,22 @@ function fromgplus_fetch($a, $uid) { $post = fromgplus_html2bbcode($item->annotation)."\n"; if (!intval(get_config('system','old_share'))) { - $post .= "[share author='".str_replace("'", "'",$item->object->actor->displayName). - "' profile='".$item->object->actor->url. - "' avatar='".$item->object->actor->image->url. - "' link='".$item->object->url."']"; + + if (function_exists("share_header")) + $post .= share_header($item->object->actor->displayName, $item->object->actor->url, + $item->object->actor->image->url, "", + datetime_convert('UTC','UTC',$item->object->published),$item->object->url); + else + $post .= "[share author='".str_replace("'", "'",$item->object->actor->displayName). + "' profile='".$item->object->actor->url. + "' avatar='".$item->object->actor->image->url. + "' posted='".datetime_convert('UTC','UTC',$item->object->published). + "' link='".$item->object->url."']"; $post .= fromgplus_html2bbcode($item->object->content); if (is_array($item->object->attachments)) - $post .= "\n".trim(fromgplus_handleattachments($item, $item->object->content)); + $post .= "\n".trim(fromgplus_handleattachments($a, $uid, $item, $item->object->content, true)); $post .= "[/share]"; } else { @@ -412,7 +487,7 @@ function fromgplus_fetch($a, $uid) { $post .= fromgplus_html2bbcode($item->object->content); if (is_array($item->object->attachments)) - $post .= "\n".trim(fromgplus_handleattachments($item, $item->object->content)); + $post .= "\n".trim(fromgplus_handleattachments($a, $uid, $item, $item->object->content, true)); } if (isset($item->address)) @@ -420,30 +495,12 @@ function fromgplus_fetch($a, $uid) { else $location = ""; - fromgplus_post($a, $uid, "Google+", $post, $location); - //fromgplus_post($a, $uid, $item->provider->title, $post, $location); + //fromgplus_post($a, $uid, "Google+", $post, $location); + fromgplus_post($a, $uid, $item->provider->title, $post, $location); break; } + } } if ($lastdate != 0) set_pconfig($uid,'fromgplus','lastdate', $lastdate); } - -/* -// Test -require_once("boot.php"); - -if(@is_null($a)) { - $a = new App; -} - -if(@is_null($db)) { - @include(".htconfig.php"); - require_once("include/dba.php"); - $db = new dba($db_host, $db_user, $db_pass, $db_data); - unset($db_host, $db_user, $db_pass, $db_data); -}; - -$test = array(); -fromgplus_cron($a, $test); -*/