X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=ec6f81f6bf92fe2de1ac269f5dcb3941ca6c107a;hb=58ac6bde098ce2b28d851767b5aaf7d9095d6a44;hp=14acc5d0f375d9f02c20398b16b0aa453792a584;hpb=7d1a6cc1d60798ff91719686c1b4686f1c4d33e6;p=friendica.git diff --git a/mod/item.php b/mod/item.php index 14acc5d0f3..ec6f81f6bf 100644 --- a/mod/item.php +++ b/mod/item.php @@ -3,23 +3,27 @@ /** * * This is the POST destination for most all locally posted - * text stuff. This function handles status, wall-to-wall status, - * local comments, and remote coments that are posted on this site + * text stuff. This function handles status, wall-to-wall status, + * local comments, and remote coments that are posted on this site * (as opposed to being delivered in a feed). - * Also processed here are posts and comments coming through the - * statusnet/twitter API. - * All of these become an "item" which is our basic unit of + * Also processed here are posts and comments coming through the + * statusnet/twitter API. + * All of these become an "item" which is our basic unit of * information. - * Posts that originate externally or do not fall into the above - * posting categories go through item_store() instead of this function. + * Posts that originate externally or do not fall into the above + * posting categories go through item_store() instead of this function. * - */ + */ require_once('include/crypto.php'); require_once('include/enotify.php'); require_once('include/email.php'); require_once('library/langdet/Text/LanguageDetect.php'); require_once('include/tags.php'); +require_once('include/files.php'); +require_once('include/threads.php'); +require_once('include/text.php'); +require_once('include/items.php'); function item_post(&$a) { @@ -31,7 +35,6 @@ function item_post(&$a) { $uid = local_user(); if(x($_REQUEST,'dropitems')) { - require_once('include/items.php'); $arr_drop = explode(',',$_REQUEST['dropitems']); drop_items($arr_drop); $json = array('success' => 1); @@ -75,9 +78,12 @@ function item_post(&$a) { $thr_parent = ''; $parid = 0; $r = false; + $objecttype = null; if($parent || $parent_uri) { + $objecttype = ACTIVITY_OBJ_COMMENT; + if(! x($_REQUEST,'type')) $_REQUEST['type'] = 'net-comment'; @@ -85,14 +91,14 @@ function item_post(&$a) { $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", intval($parent) ); - } - elseif($parent_uri && local_user()) { + } elseif($parent_uri && local_user()) { // This is coming from an API source, and we are logged in $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($parent_uri), intval(local_user()) ); } + // if this isn't the real parent of the conversation, find it if($r !== false && count($r)) { $parid = $r[0]['parent']; @@ -122,8 +128,27 @@ function item_post(&$a) { intval($parent_item['contact-id']), intval($uid) ); - if(count($r)) + if(count($r)) { $parent_contact = $r[0]; + + // If the contact id doesn't fit with the contact, then set the contact to null + $thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($thr_parent)); + if (count($thrparent) AND ($thrparent[0]["network"] === NETWORK_OSTATUS) + AND (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) { + $parent_contact = null; + + require_once("include/Scrape.php"); + $probed_contact = probe_url($thrparent[0]["author-link"]); + if ($probed_contact["network"] != NETWORK_FEED) { + $parent_contact = $probed_contact; + $parent_contact["nurl"] = normalise_link($probed_contact["url"]); + $parent_contact["thumb"] = $probed_contact["photo"]; + $parent_contact["micro"] = $probed_contact["photo"]; + } + logger('parent contact: '.print_r($parent_contact, true), LOGGER_DEBUG); + } else + logger('no contact found: '.print_r($thrparent, true), LOGGER_DEBUG); + } } } @@ -132,6 +157,7 @@ function item_post(&$a) { $profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0); $post_id = ((x($_REQUEST,'post_id')) ? intval($_REQUEST['post_id']) : 0); $app = ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''); + $extid = ((x($_REQUEST,'extid')) ? strip_tags($_REQUEST['extid']) : ''); $allow_moderated = false; @@ -141,7 +167,7 @@ function item_post(&$a) { if((x($_REQUEST,'commenter')) && ((! $parent) || (! $parent_item['wall']))) { notice( t('Permission denied.') . EOL) ; - if(x($_REQUEST,'return')) + if(x($_REQUEST,'return')) goaway($a->get_baseurl() . "/" . $return_path ); killme(); } @@ -193,22 +219,25 @@ function item_post(&$a) { $location = $orig_post['location']; $coord = $orig_post['coord']; $verb = $orig_post['verb']; + $objecttype = $orig_post['object-type']; $emailcc = $orig_post['emailcc']; - $app = $orig_post['app']; + $app = $orig_post['app']; $categories = $orig_post['file']; $title = notags(trim($_REQUEST['title'])); $body = escape_tags(trim($_REQUEST['body'])); $private = $orig_post['private']; $pubmail_enable = $orig_post['pubmail']; + $network = $orig_post['network']; + $guid = $orig_post['guid']; + $extid = $orig_post['extid']; - } - else { + } else { - // if coming from the API and no privacy settings are set, + // if coming from the API and no privacy settings are set, // use the user default permissions - as they won't have // been supplied via a form. - if(($api_source) + if(($api_source) && (! array_key_exists('contact_allow',$_REQUEST)) && (! array_key_exists('group_allow',$_REQUEST)) && (! array_key_exists('contact_deny',$_REQUEST)) @@ -234,6 +263,8 @@ function item_post(&$a) { $verb = notags(trim($_REQUEST['verb'])); $emailcc = notags(trim($_REQUEST['emailcc'])); $body = escape_tags(trim($_REQUEST['body'])); + $network = notags(trim($_REQUEST['network'])); + $guid = get_guid(32); $naked_body = preg_replace('/\[(.+?)\]/','',$body); @@ -275,6 +306,12 @@ function item_post(&$a) { if($parent_item) { $private = 0; + // for non native networks use the network of the original post as network of the item + if (($parent_item['network'] != NETWORK_DIASPORA) + AND ($parent_item['network'] != NETWORK_OSTATUS) + AND ($network == "")) + $network = $parent_item['network']; + if(($parent_item['private']) || strlen($parent_item['allow_cid']) || strlen($parent_item['allow_gid']) @@ -288,7 +325,6 @@ function item_post(&$a) { $str_contact_deny = $parent_item['deny_cid']; $str_group_deny = $parent_item['deny_gid']; } - $pubmail_enable = ((x($_REQUEST,'pubmail_enable') && intval($_REQUEST['pubmail_enable']) && (! $private)) ? 1 : 0); // if using the API, we won't see pubmail_enable - figure out if it should be set @@ -329,7 +365,7 @@ function item_post(&$a) { // Work around doubled linefeeds in Tinymce 3.5b2 // First figure out if it's a status post that would've been - // created using tinymce. Otherwise leave it alone. + // created using tinymce. Otherwise leave it alone. /* $plaintext = (local_user() ? intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled($profile_uid,'richtext') : 0); if((! $parent) && (! $api_source) && (! $plaintext)) { @@ -415,6 +451,9 @@ function item_post(&$a) { if((! $preview) && preg_match_all("/\[img([\=0-9x]*?)\](.*?)\[\/img\]/",$body,$match)) { $images = $match[2]; if(count($images)) { + + $objecttype = ACTIVITY_OBJ_IMAGE; + foreach($images as $image) { if(! stristr($image,$a->get_baseurl() . '/photo/')) continue; @@ -484,6 +523,7 @@ function item_post(&$a) { $bookmark = 0; if(preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$body,$match,PREG_SET_ORDER)) { + $objecttype = ACTIVITY_OBJ_BOOKMARK; $bookmark = 1; } @@ -494,11 +534,25 @@ function item_post(&$a) { * Fold multi-line [code] sequences */ - $body = preg_replace('/\[\/code\]\s*\[code\]/ism',"\n",$body); + $body = preg_replace('/\[\/code\]\s*\[code\]/ism',"\n",$body); $body = scale_external_images($body,false); + // Setting the object type if not defined before + if (!$objecttype) { + $objecttype = ACTIVITY_OBJ_NOTE; // Default value + require_once("include/plaintext.php"); + $objectdata = get_attached_data($body); + + if ($post["type"] == "link") + $objecttype = ACTIVITY_OBJ_BOOKMARK; + elseif ($post["type"] == "video") + $objecttype = ACTIVITY_OBJ_VIDEO; + elseif ($post["type"] == "photo") + $objecttype = ACTIVITY_OBJ_IMAGE; + + } /** * Look for any tags and linkify them @@ -515,11 +569,11 @@ function item_post(&$a) { * and we are replying, and there isn't one already */ - if(($parent_contact) && ($parent_contact['network'] === NETWORK_OSTATUS) + if(($parent_contact) && ($parent_contact['network'] === NETWORK_OSTATUS) && ($parent_contact['nick']) && (! in_array('@' . $parent_contact['nick'],$tags))) { $body = '@' . $parent_contact['nick'] . ' ' . $body; $tags[] = '@' . $parent_contact['nick']; - } + } $tagged = array(); @@ -528,6 +582,9 @@ function item_post(&$a) { if(count($tags)) { foreach($tags as $tag) { + if(strpos($tag,'#') === 0) + continue; + // If we already tagged 'Robert Johnson', don't try and tag 'Robert'. // Robert Johnson should be first in the $tags array @@ -541,7 +598,7 @@ function item_post(&$a) { if($fullnametagged) continue; - $success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag); + $success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag, $network); if($success['replaced']) $tagged[] = $tag; if(is_array($success['contact']) && intval($success['contact']['prv'])) { @@ -570,7 +627,7 @@ function item_post(&$a) { if(count($r)) { if(strlen($attachments)) $attachments .= ','; - $attachments .= '[attach]href="' . $a->get_baseurl() . '/attach/' . $r[0]['id'] . '" length="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : '') . '"[/attach]'; + $attachments .= '[attach]href="' . $a->get_baseurl() . '/attach/' . $r[0]['id'] . '" length="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : '') . '"[/attach]'; } $body = str_replace($match[1],'',$body); } @@ -584,13 +641,16 @@ function item_post(&$a) { if(! strlen($verb)) $verb = ACTIVITY_POST ; + if ($network == "") + $network = NETWORK_DFRN; + $gravity = (($parent) ? 6 : 0 ); - // even if the post arrived via API we are considering that it + // even if the post arrived via API we are considering that it // originated on this site by default for determining relayability. $origin = ((x($_REQUEST,'origin')) ? intval($_REQUEST['origin']) : 1); - + $notify_type = (($parent) ? 'comment-new' : 'wall-new' ); $uri = (($message_id) ? $message_id : item_new_uri($a->get_hostname(),$profile_uid)); @@ -604,6 +664,7 @@ function item_post(&$a) { $datarray['type'] = $post_type; $datarray['wall'] = $wall; $datarray['gravity'] = $gravity; + $datarray['network'] = $network; $datarray['contact-id'] = $contact_id; $datarray['owner-name'] = $contact_record['name']; $datarray['owner-link'] = $contact_record['url']; @@ -616,6 +677,8 @@ function item_post(&$a) { $datarray['commented'] = datetime_convert(); $datarray['received'] = datetime_convert(); $datarray['changed'] = datetime_convert(); + $datarray['extid'] = $extid; + $datarray['guid'] = $guid; $datarray['uri'] = $uri; $datarray['title'] = $title; $datarray['body'] = $body; @@ -626,6 +689,7 @@ function item_post(&$a) { $datarray['file'] = $categories; $datarray['inform'] = $inform; $datarray['verb'] = $verb; + $datarray['object-type'] = $objecttype; $datarray['allow_cid'] = $str_contact_allow; $datarray['allow_gid'] = $str_group_allow; $datarray['deny_cid'] = $str_contact_deny; @@ -651,8 +715,9 @@ function item_post(&$a) { if($orig_post) $datarray['edit'] = true; - else - $datarray['guid'] = get_guid(); + + // Search for hashtags + item_body_set_hashtags($datarray); // preview mode - prepare the body for display and send it via json @@ -681,22 +746,30 @@ function item_post(&$a) { killme(); } + // Fill the cache field + put_item_in_cache($datarray); if($orig_post) { - $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `attach` = '%s', `file` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d", + $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `attach` = '%s', `file` = '%s', `rendered-html` = '%s', `rendered-hash` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc($datarray['title']), dbesc($datarray['body']), dbesc($datarray['tag']), dbesc($datarray['attach']), dbesc($datarray['file']), + dbesc($datarray['rendered-html']), + dbesc($datarray['rendered-hash']), + dbesc(datetime_convert()), dbesc(datetime_convert()), intval($post_id), intval($profile_uid) ); - create_tags_from_itemuri($post_id, $profile_uid); + + create_tags_from_item($post_id); + create_files_from_item($post_id); + update_thread($post_id); // update filetags in pconfig - file_tag_update_pconfig($uid,$categories_old,$categories_new,'category'); + file_tag_update_pconfig($uid,$categories_old,$categories_new,'category'); proc_run('php', "include/notifier.php", 'edit_post', "$post_id"); if((x($_REQUEST,'return')) && strlen($return_path)) { @@ -709,15 +782,17 @@ function item_post(&$a) { $post_id = 0; - $r = q("INSERT INTO `item` (`guid`, `uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, - `author-name`, `author-link`, `author-avatar`, `created`, `edited`, `commented`, `received`, `changed`, `uri`, `thr-parent`, `title`, `body`, `app`, `location`, `coord`, - `tag`, `inform`, `verb`, `postopts`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin`, `moderated`, `file` ) - VALUES( '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, '%s' )", + $r = q("INSERT INTO `item` (`guid`, `extid`, `uid`,`type`,`wall`,`gravity`, `network`, `contact-id`,`owner-name`,`owner-link`,`owner-avatar`, `author-name`, `author-link`, `author-avatar`, + `created`, `edited`, `commented`, `received`, `changed`, `uri`, `thr-parent`, `title`, `body`, `app`, `location`, `coord`, `tag`, `inform`, `verb`, `object-type`, `postopts`, + `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin`, `moderated`, `file`, `rendered-html`, `rendered-hash`) + VALUES( '%s', '%s', %d, '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, '%s', '%s', '%s')", dbesc($datarray['guid']), + dbesc($datarray['extid']), intval($datarray['uid']), dbesc($datarray['type']), intval($datarray['wall']), intval($datarray['gravity']), + dbesc($datarray['network']), intval($datarray['contact-id']), dbesc($datarray['owner-name']), dbesc($datarray['owner-link']), @@ -740,6 +815,7 @@ function item_post(&$a) { dbesc($datarray['tag']), dbesc($datarray['inform']), dbesc($datarray['verb']), + dbesc($datarray['object-type']), dbesc($datarray['postopts']), dbesc($datarray['allow_cid']), dbesc($datarray['allow_gid']), @@ -750,128 +826,121 @@ function item_post(&$a) { dbesc($datarray['attach']), intval($datarray['bookmark']), intval($datarray['origin']), - intval($datarray['moderated']), - dbesc($datarray['file']) + intval($datarray['moderated']), + dbesc($datarray['file']), + dbesc($datarray['rendered-html']), + dbesc($datarray['rendered-hash']) ); $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($datarray['uri'])); - if(count($r)) { - $post_id = $r[0]['id']; - logger('mod_item: saved item ' . $post_id); - create_tags_from_item($post_id); + if(!count($r)) { + logger('mod_item: unable to retrieve post that was just stored.'); + notice( t('System error. Post not saved.') . EOL); + goaway($a->get_baseurl() . "/" . $return_path ); + // NOTREACHED + } - // update filetags in pconfig - file_tag_update_pconfig($uid,$categories_old,$categories_new,'category'); + $post_id = $r[0]['id']; + logger('mod_item: saved item ' . $post_id); - // Store the fresh generated item into the cache - $cachefile = get_cachefile($datarray["guid"]."-".hash("md5", $datarray['body'])); + $datarray["id"] = $post_id; + $datarray["plink"] = $a->get_baseurl().'/display/'.urlencode($datarray["guid"]); - if (($cachefile != '') AND !file_exists($cachefile)) { - $s = prepare_text($datarray['body']); - $stamp1 = microtime(true); - file_put_contents($cachefile, $s); - $a->save_timestamp($stamp1, "file"); - logger('mod_item: put item '.$r[0]['id'].' into cachefile '.$cachefile); - } + // update filetags in pconfig + file_tag_update_pconfig($uid,$categories_old,$categories_new,'category'); - if($parent) { + if($parent) { - // This item is the last leaf and gets the comment box, clear any ancestors - $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent` = %d ", - dbesc(datetime_convert()), - intval($parent) - ); + // This item is the last leaf and gets the comment box, clear any ancestors + $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent` = %d ", + dbesc(datetime_convert()), + intval($parent) + ); + update_thread($parent, true); - // Inherit ACL's from the parent item. + // Inherit ACLs from the parent item. - $r = q("UPDATE `item` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `private` = %d - WHERE `id` = %d", - dbesc($parent_item['allow_cid']), - dbesc($parent_item['allow_gid']), - dbesc($parent_item['deny_cid']), - dbesc($parent_item['deny_gid']), - intval($parent_item['private']), - intval($post_id) - ); + $r = q("UPDATE `item` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `private` = %d + WHERE `id` = %d", + dbesc($parent_item['allow_cid']), + dbesc($parent_item['allow_gid']), + dbesc($parent_item['deny_cid']), + dbesc($parent_item['deny_gid']), + intval($parent_item['private']), + intval($post_id) + ); - if($contact_record != $author) { - notification(array( - 'type' => NOTIFY_COMMENT, - 'notify_flags' => $user['notify-flags'], - 'language' => $user['language'], - 'to_name' => $user['username'], - 'to_email' => $user['email'], - 'uid' => $user['uid'], - 'item' => $datarray, - 'link' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id, - 'source_name' => $datarray['author-name'], - 'source_link' => $datarray['author-link'], - 'source_photo' => $datarray['author-avatar'], - 'verb' => ACTIVITY_POST, - 'otype' => 'item', - 'parent' => $parent, - 'parent_uri' => $parent_item['uri'] - )); - - } + if($contact_record != $author) { + notification(array( + 'type' => NOTIFY_COMMENT, + 'notify_flags' => $user['notify-flags'], + 'language' => $user['language'], + 'to_name' => $user['username'], + 'to_email' => $user['email'], + 'uid' => $user['uid'], + 'item' => $datarray, + 'link' => $a->get_baseurl().'/display/'.urlencode($datarray['guid']), + 'source_name' => $datarray['author-name'], + 'source_link' => $datarray['author-link'], + 'source_photo' => $datarray['author-avatar'], + 'verb' => ACTIVITY_POST, + 'otype' => 'item', + 'parent' => $parent, + 'parent_uri' => $parent_item['uri'] + )); + } - // Store the comment signature information in case we need to relay to Diaspora - store_diaspora_comment_sig($datarray, $author, ($self ? $a->user['prvkey'] : false), $parent_item, $post_id); + // Store the comment signature information in case we need to relay to Diaspora + store_diaspora_comment_sig($datarray, $author, ($self ? $a->user['prvkey'] : false), $parent_item, $post_id); + + } else { + $parent = $post_id; + + if($contact_record != $author) { + notification(array( + 'type' => NOTIFY_WALL, + 'notify_flags' => $user['notify-flags'], + 'language' => $user['language'], + 'to_name' => $user['username'], + 'to_email' => $user['email'], + 'uid' => $user['uid'], + 'item' => $datarray, + 'link' => $a->get_baseurl().'/display/'.urlencode($datarray['guid']), + 'source_name' => $datarray['author-name'], + 'source_link' => $datarray['author-link'], + 'source_photo' => $datarray['author-avatar'], + 'verb' => ACTIVITY_POST, + 'otype' => 'item' + )); } - else { - $parent = $post_id; - - if($contact_record != $author) { - notification(array( - 'type' => NOTIFY_WALL, - 'notify_flags' => $user['notify-flags'], - 'language' => $user['language'], - 'to_name' => $user['username'], - 'to_email' => $user['email'], - 'uid' => $user['uid'], - 'item' => $datarray, - 'link' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id, - 'source_name' => $datarray['author-name'], - 'source_link' => $datarray['author-link'], - 'source_photo' => $datarray['author-avatar'], - 'verb' => ACTIVITY_POST, - 'otype' => 'item' - )); - } - } + } - // fallback so that parent always gets set to non-zero. + // fallback so that parent always gets set to non-zero. - if(! $parent) - $parent = $post_id; + if(! $parent) + $parent = $post_id; - $r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `plink` = '%s', `changed` = '%s', `last-child` = 1, `visible` = 1 - WHERE `id` = %d", - intval($parent), - dbesc(($parent == $post_id) ? $uri : $parent_item['uri']), - dbesc($a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id), - dbesc(datetime_convert()), - intval($post_id) - ); + $r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `plink` = '%s', `changed` = '%s', `last-child` = 1, `visible` = 1 + WHERE `id` = %d", + intval($parent), + dbesc(($parent == $post_id) ? $uri : $parent_item['uri']), + dbesc($a->get_baseurl().'/display/'.urlencode($datarray['guid'])), + dbesc(datetime_convert()), + intval($post_id) + ); - // photo comments turn the corresponding item visible to the profile wall - // This way we don't see every picture in your new photo album posted to your wall at once. - // They will show up as people comment on them. + // photo comments turn the corresponding item visible to the profile wall + // This way we don't see every picture in your new photo album posted to your wall at once. + // They will show up as people comment on them. - if(! $parent_item['visible']) { - $r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d", - intval($parent_item['id']) - ); - } - } - else { - logger('mod_item: unable to retrieve post that was just stored.'); - notice( t('System error. Post not saved.') . EOL); - goaway($a->get_baseurl() . "/" . $return_path ); - // NOTREACHED + if(! $parent_item['visible']) { + $r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d", + intval($parent_item['id']) + ); + update_thread($parent_item['id']); } // update the commented timestamp on the parent @@ -881,9 +950,8 @@ function item_post(&$a) { dbesc(datetime_convert()), intval($parent) ); - - $datarray['id'] = $post_id; - $datarray['plink'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id; + if ($post_id != $parent) + update_thread($parent); call_hooks('post_local_end', $datarray); @@ -894,33 +962,39 @@ function item_post(&$a) { $addr = trim($recip); if(! strlen($addr)) continue; - $disclaimer = '