X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=appnet%2Fappnet.php;h=7e80c6abd2d9471aa3f31c6ece0d688f4e5526af;hb=3d8d0e2860c3cb379e486e5a9565df5cbcc041a0;hp=db595c996ace365fe611de812b243b5de44c416f;hpb=179b19473cd5c88f9a7236e26c151ecdd46a609f;p=friendica-addons.git diff --git a/appnet/appnet.php b/appnet/appnet.php index db595c99..7e80c6ab 100644 --- a/appnet/appnet.php +++ b/appnet/appnet.php @@ -12,6 +12,7 @@ - Use embedded pictures for the attachment information (large attachment) - Sound links must be handled - https://alpha.app.net/sr_rolando/post/32365203 - double pictures + - https://alpha.app.net/opendev/post/34396399 - location data */ define('APPNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes @@ -23,6 +24,7 @@ function appnet_install() { register_hook('cron', 'addon/appnet/appnet.php', 'appnet_cron'); register_hook('connector_settings', 'addon/appnet/appnet.php', 'appnet_settings'); register_hook('connector_settings_post','addon/appnet/appnet.php', 'appnet_settings_post'); + register_hook('prepare_body', 'addon/appnet/appnet.php', 'appnet_prepare_body'); } @@ -31,8 +33,9 @@ function appnet_uninstall() { unregister_hook('notifier_normal', 'addon/appnet/appnet.php', 'appnet_send'); unregister_hook('jot_networks', 'addon/appnet/appnet.php', 'appnet_jot_nets'); unregister_hook('cron', 'addon/appnet/appnet.php', 'appnet_cron'); - unregister_hook('connector_settings', 'addon/appnet/appnet.php', 'appnet_settings'); + unregister_hook('connector_settings', 'addon/appnet/appnet.php', 'appnet_settings'); unregister_hook('connector_settings_post', 'addon/appnet/appnet.php', 'appnet_settings_post'); + unregister_hook('prepare_body', 'addon/appnet/appnet.php', 'appnet_prepare_body'); } function appnet_module() {} @@ -304,12 +307,13 @@ function appnet_create_entities($a, $b, $postdata) { $bbcode = preg_replace("/@\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",'@$2',$bbcode); $bbcode = preg_replace("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism",'[url=$1]$2[/url]',$bbcode); $bbcode = preg_replace("/\[video\](.*?)\[\/video\]/ism",'[url=$1]$1[/url]',$bbcode); + $bbcode = preg_replace("/\[youtube\]https?:\/\/(.*?)\[\/youtube\]/ism",'[url=https://$1]https://$1[/url]',$bbcode); $bbcode = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '[url=https://www.youtube.com/watch?v=$1]https://www.youtube.com/watch?v=$1[/url]', $bbcode); - $bbcode = preg_replace("/\[youtube\](.*?)\[\/youtube\]/ism",'[url=$1]$1[/url]',$bbcode); + $bbcode = preg_replace("/\[vimeo\]https?:\/\/(.*?)\[\/vimeo\]/ism",'[url=https://$1]https://$1[/url]',$bbcode); $bbcode = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '[url=https://vimeo.com/$1]https://vimeo.com/$1[/url]', $bbcode); - $bbcode = preg_replace("/\[vimeo\](.*?)\[\/vimeo\]/ism",'[url=$1]$1[/url]',$bbcode); + //$bbcode = preg_replace("/\[vimeo\](.*?)\[\/vimeo\]/ism",'[url=$1]$1[/url]',$bbcode); $bbcode = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $bbcode); @@ -342,6 +346,7 @@ function appnet_create_entities($a, $b, $postdata) { $mid = $url[2]; $html = bbcode($mid, false, false, 6); $mid = html2plain($html, 0, true); + $mid = trim(html_entity_decode($mid,ENT_QUOTES,'UTF-8')); $text = $pre.$mid.$post; @@ -354,18 +359,26 @@ function appnet_create_entities($a, $b, $postdata) { if (isset($postdata["url"]) AND isset($postdata["title"])) { $postdata["title"] = shortenmsg($postdata["title"], 90); - $text = shortenmsg($text, 256 - strlen($postdata["title"])); + $max = 256 - strlen($postdata["title"]); + $text = shortenmsg($text, $max); $text .= "\n[".$postdata["title"]."](".$postdata["url"].")"; } elseif (isset($postdata["url"])) { $postdata["url"] = short_link($postdata["url"]); - $text = shortenmsg($text, 240); + $max = 240; + $text = shortenmsg($text, $max); $text .= " [".$postdata["url"]."](".$postdata["url"].")"; - } else - $text = shortenmsg($text, 256); + } else { + $max = 256; + $text = shortenmsg($text, $max); + } + + if (iconv_strlen($text, "UTF-8") < $max) + $max = iconv_strlen($text, "UTF-8"); krsort($entities); foreach ($entities AS $entity) { - if (iconv_strlen($text) >= $entity["pos"] + $entity["len"]) { + //if (iconv_strlen($text, "UTF-8") >= $entity["pos"] + $entity["len"]) { + if (($entity["pos"] + $entity["len"]) <= $max) { $pre = iconv_substr($text, 0, $entity["pos"], "UTF-8"); $post = iconv_substr($text, $entity["pos"] + $entity["len"], 1000000, "UTF-8"); @@ -373,6 +386,7 @@ function appnet_create_entities($a, $b, $postdata) { } } + return($text); } @@ -465,7 +479,7 @@ function appnet_send(&$a,&$b) { if (isset($post["image"])) { $img_str = fetch_url($post['image'],true, $redirects, 10); - $tempfile = tempnam(get_config("system","temppath"), "cache"); + $tempfile = tempnam(get_temppath(), "cache"); file_put_contents($tempfile, $img_str); try { @@ -482,7 +496,7 @@ function appnet_send(&$a,&$b) { ); } catch (AppDotNetException $e) { - logger("appnet_send: Error creating file ".$e->getMessage()); + logger("appnet_send: Error creating file ".appnet_error($e->getMessage())); } unlink($tempfile); @@ -540,7 +554,7 @@ function appnet_send(&$a,&$b) { } } catch (AppDotNetException $e) { - logger("appnet_send: Error sending message ".$b["id"]." ".$e->getMessage()); + logger("appnet_send: Error sending message ".$b["id"]." ".appnet_error($e->getMessage())); } } } @@ -572,7 +586,7 @@ function appnet_action($a, $uid, $pid, $action) { logger("appnet_action '".$action."' send, result: " . print_r($result, true), LOGGER_DEBUG); } catch (AppDotNetException $e) { - logger("appnet_action: Error sending action ".$action." pid ".$pid." ".$e->getMessage(), LOGGER_DEBUG); + logger("appnet_action: Error sending action ".$action." pid ".$pid." ".appnet_error($e->getMessage()), LOGGER_DEBUG); } } @@ -623,7 +637,7 @@ function appnet_is_repost($a, $uid, $body) { return true; } catch (AppDotNetException $e) { - logger('appnet_is_repost: error doing repost '.$e->getMessage(), LOGGER_DEBUG); + logger('appnet_is_repost: error doing repost '.appnet_error($e->getMessage()), LOGGER_DEBUG); return false; } } @@ -675,7 +689,7 @@ function appnet_fetchstream($a, $uid) { $stream = $app->getUserStream($param); } catch (AppDotNetException $e) { - logger("appnet_fetchstream: Error fetching stream for user ".$uid." ".$e->getMessage()); + logger("appnet_fetchstream: Error fetching stream for user ".$uid." ".appnet_error($e->getMessage())); } $stream = array_reverse($stream); @@ -702,7 +716,7 @@ function appnet_fetchstream($a, $uid) { 'to_email' => $user['email'], 'uid' => $user['uid'], 'item' => $postarray, - 'link' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item, + 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)), 'source_name' => $postarray['author-name'], 'source_link' => $postarray['author-link'], 'source_photo' => $postarray['author-avatar'], @@ -729,24 +743,42 @@ function appnet_fetchstream($a, $uid) { $mentions = $app->getUserMentions("me", $param); } catch (AppDotNetException $e) { - logger("appnet_fetchstream: Error fetching mentions for user ".$uid." ".$e->getMessage()); + logger("appnet_fetchstream: Error fetching mentions for user ".$uid." ".appnet_error($e->getMessage())); } $mentions = array_reverse($mentions); foreach ($mentions AS $post) { $postarray = appnet_createpost($a, $uid, $post, $me, $user, $ownid, false); - if (isset($postarray["id"])) + if (isset($postarray["id"])) { $item = $postarray["id"]; - elseif (isset($postarray["body"])) { + $parent_id = $postarray['parent']; + } elseif (isset($postarray["body"])) { $item = item_store($postarray); + $parent_id = 0; logger('appnet_fetchstream: User '.$uid.' posted mention item '.$item); - } else + } else { $item = 0; + $parent_id = 0; + } + + // Fetch the parent and id + if (($parent_id == 0) AND ($postarray['uri'] != "")) { + $r = q("SELECT `id`, `parent` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($postarray['uri']), + intval($uid) + ); + + if (count($r)) { + $item = $r[0]['id']; + $parent_id = $r[0]['parent']; + } + } $lastid = $post["id"]; - if (($item != 0) AND ($postarray['contact-id'] != $me["id"])) { + //if (($item != 0) AND ($postarray['contact-id'] != $me["id"])) { + if ($item != 0) { require_once('include/enotify.php'); notification(array( 'type' => NOTIFY_TAGSELF, @@ -756,12 +788,13 @@ function appnet_fetchstream($a, $uid) { 'to_email' => $user['email'], 'uid' => $user['uid'], 'item' => $postarray, - 'link' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item, + 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)), 'source_name' => $postarray['author-name'], 'source_link' => $postarray['author-link'], 'source_photo' => $postarray['author-avatar'], 'verb' => ACTIVITY_TAG, - 'otype' => 'item' + 'otype' => 'item', + 'parent' => $parent_id, )); } } @@ -777,7 +810,7 @@ function appnet_fetchstream($a, $uid) { */ } -function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $threadcompletion = true) { +function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $threadcompletion = true, $nodupcheck = false) { require_once('include/items.php'); if ($post["machine_only"]) @@ -792,35 +825,45 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th $postarray['wall'] = 0; $postarray['verb'] = ACTIVITY_POST; $postarray['network'] = dbesc(NETWORK_APPNET); - $postarray['uri'] = "adn::".$post["id"]; + if (is_array($post["repost_of"])) { + // You can't reply to reposts. So use the original id and thread-id + $postarray['uri'] = "adn::".$post["repost_of"]["id"]; + $postarray['parent-uri'] = "adn::".$post["repost_of"]["thread_id"]; + } else { + $postarray['uri'] = "adn::".$post["id"]; + $postarray['parent-uri'] = "adn::".$post["thread_id"]; + } - $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($postarray['uri']), - intval($uid) - ); + if (!$nodupcheck) { + $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($postarray['uri']), + intval($uid) + ); - if (count($r)) - return($r[0]); + if (count($r)) + return($r[0]); - $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", - dbesc($postarray['uri']), - intval($uid) - ); + $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", + dbesc($postarray['uri']), + intval($uid) + ); - if (count($r)) - return($r[0]); + if (count($r)) + return($r[0]); + } - $postarray['parent-uri'] = "adn::".$post["thread_id"]; if (isset($post["reply_to"]) AND ($post["reply_to"] != "")) { $postarray['thr-parent'] = "adn::".$post["reply_to"]; - // Complete the thread if the parent doesn't exists + // Complete the thread (if the parent doesn't exists) if ($threadcompletion) { - $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($postarray['thr-parent']), - intval($uid) - ); - if (!count($r)) { + //$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + // dbesc($postarray['thr-parent']), + // intval($uid) + // ); + //if (!count($r)) { + logger("appnet_createpost: completing thread ".$post["thread_id"]." for user ".$uid, LOGGER_DEBUG); + require_once("addon/appnet/AppDotNet.php"); $token = get_pconfig($uid,'appnet','token'); @@ -836,19 +879,27 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th $thread = $app->getPostReplies($post["thread_id"], $param); } catch (AppDotNetException $e) { - logger("appnet_createpost: Error fetching thread for user ".$uid." ".$e->getMessage()); + logger("appnet_createpost: Error fetching thread for user ".$uid." ".appnet_error($e->getMessage())); } $thread = array_reverse($thread); + + logger("appnet_createpost: fetched ".count($thread)." items for thread ".$post["thread_id"]." for user ".$uid, LOGGER_DEBUG); + foreach ($thread AS $tpost) { - $threadpost = appnet_createpost($a, $uid, $tpost, $me, $user, $ownid, $createuser, false); + $threadpost = appnet_createpost($a, $uid, $tpost, $me, $user, $ownid, false, false); $item = item_store($threadpost); + logger("appnet_createpost: stored post ".$post["id"]." thread ".$post["thread_id"]." in item ".$item, LOGGER_DEBUG); } - } + //} } - } else - $postarray['thr-parent'] = $postarray['uri']; + // Don't create accounts of people who just comment something + $createuser = false; - $postarray['plink'] = $post["canonical_url"]; + $postarray['object-type'] = ACTIVITY_OBJ_COMMENT; + } else { + $postarray['thr-parent'] = $postarray['uri']; + $postarray['object-type'] = ACTIVITY_OBJ_NOTE; + } if (($post["user"]["id"] != $ownid) OR ($postarray['thr-parent'] == $postarray['uri'])) { $postarray['owner-name'] = $post["user"]["name"]; @@ -878,6 +929,8 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th $content = $post; } + $postarray['plink'] = $content["canonical_url"]; + if (is_array($content["entities"])) { $converted = appnet_expand_entities($a, $content["text"], $content["entities"]); $postarray['body'] = $converted["body"]; @@ -891,7 +944,7 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th $links[$url] = $link["url"]; } - if (sizeof($content["annotations"])) + /* if (sizeof($content["annotations"])) foreach($content["annotations"] AS $annotation) { if ($annotation[type] == "net.app.core.oembed") { if (isset($annotation["value"]["embeddable_url"])) { @@ -900,7 +953,6 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th unset($links[$url]); } } elseif ($annotation[type] == "com.friendica.post") { - // Nur zum Testen deaktiviert //$links = array(); //if (isset($annotation["value"]["post-title"])) // $postarray['title'] = $annotation["value"]["post-title"]; @@ -921,7 +973,7 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th $postarray['author-avatar'] = $annotation["value"]["author-avatar"]; } - } + } */ $page_info = ""; @@ -931,19 +983,24 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th $page_info = "\n[url=".$photo["url"]."][img]".$photo["large"]."[/img][/url]"; elseif ($photo["url"] != "") $page_info = "\n[img]".$photo["url"]."[/img]"; + + if ($photo["url"] != "") + $postarray['object-type'] = ACTIVITY_OBJ_IMAGE; + } else $photo = array("url" => "", "large" => ""); if (sizeof($links)) { $link = array_pop($links); - $url = "[url=".$link."]".$link."[/url]"; - - $removedlink = trim(str_replace($url, "", $postarray['body'])); - - if (($removedlink == "") OR strstr($postarray['body'], $removedlink)) - $postarray['body'] = $removedlink; + $url = str_replace(array('/', '.'), array('\/', '\.'), $link); $page_info = add_page_info($link, false, $photo["url"]); + + if (trim($page_info) != "") { + $removedlink = preg_replace("/\[url\=".$url."\](.*?)\[\/url\]/ism", '', $postarray['body']); + if (($removedlink == "") OR strstr($postarray['body'], $removedlink)) + $postarray['body'] = $removedlink; + } } $postarray['body'] .= $page_info; @@ -1029,8 +1086,10 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) { intval($uid), dbesc("adn::".$contact["id"])); if(!count($r) AND !$create_user) - return($me); + return($me["id"]); + if ($contact["canonical_url"] == "") + return($me["id"]); if (count($r) AND ($r[0]["readonly"] OR $r[0]["blocked"])) { logger("appnet_fetchcontact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG); @@ -1038,6 +1097,13 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) { } if(!count($r)) { + + if ($contact["name"] == "") + $contact["name"] = $contact["username"]; + + if ($contact["username"] == "") + $contact["username"] = $contact["name"]; + // create contact record q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`, @@ -1146,6 +1212,43 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) { return($r[0]["id"]); } +function appnet_prepare_body(&$a,&$b) { + if ($b["item"]["network"] != NETWORK_APPNET) + return; + + if ($b["preview"]) { + $max_char = 256; + require_once("include/plaintext.php"); + $item = $b["item"]; + $item["plink"] = $a->get_baseurl()."/display/".$a->user["nickname"]."/".$item["parent"]; + + $r = q("SELECT `author-link` FROM item WHERE item.uri = '%s' AND item.uid = %d LIMIT 1", + dbesc($item["thr-parent"]), + intval(local_user())); + + if(count($r)) { + $orig_post = $r[0]; + + $nicknameplain = preg_replace("=https?://alpha.app.net/(.*)=ism", "$1", $orig_post["author-link"]); + $nickname = "@[url=".$orig_post["author-link"]."]".$nicknameplain."[/url]"; + $nicknameplain = "@".$nicknameplain; + + if ((strpos($item["body"], $nickname) === false) AND (strpos($item["body"], $nicknameplain) === false)) + $item["body"] = $nickname." ".$item["body"]; + } + + + + $msgarr = plaintext($a, $item, $max_char, true); + $msg = appnet_create_entities($a, $item, $msgarr); + + require_once("library/markdown.php"); + $msg = Markdown($msg); + + $b['html'] = $msg; + } +} + function appnet_cron($a,$b) { $last = get_config('appnet','last_poll'); @@ -1174,3 +1277,23 @@ function appnet_cron($a,$b) { set_config('appnet','last_poll', time()); } + +function appnet_error($msg) { + $msg = trim($msg); + $pos = strrpos($msg, "\r\n\r\n"); + + if (!$pos) + return($msg); + + $msg = substr($msg, $pos + 4); + + $error = json_decode($msg); + + if ($error == NULL) + return($msg); + + if (isset($error->meta->error_message)) + return($error->meta->error_message); + else + return(print_r($error)); +}