- 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
'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'],
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,
'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,
));
}
}
*/
}
-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"])
$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"];
}
// Don't create accounts of people who just comment something
$createuser = false;
- } else
- $postarray['thr-parent'] = $postarray['uri'];
- $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"];
$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"];
$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"])) {
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"];
$postarray['author-avatar'] = $annotation["value"]["author-avatar"];
}
- }
+ } */
$page_info = "";
$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;
projects / friendica-addons.git / blobdiff