friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge https://github.com/friendica/friendica into pull

This commit is contained in:
friendica 2013-04-21 16:07:26 -07:00
parent bc68892cf9 ce23f9cd7b
commit a34b1ceb3a
1 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
include/items.php
View File

@ -1180,19 +1180,23 @@ function item_store($arr,$force_parent = false) {
); );
} }
tag_deliver($arr['uid'],$current_post); $deleted = tag_deliver($arr['uid'],$current_post);
// Store the fresh generated item into the cache // current post can be deleted if is for a communuty page and no mention are
$cachefile = get_cachefile($arr["guid"]."-".hash("md5", $arr['body'])); // in it.
if (!$deleted) {
// Store the fresh generated item into the cache
$cachefile = get_cachefile($arr["guid"]."-".hash("md5", $arr['body']));
if (($cachefile != '') AND !file_exists($cachefile)) { if (($cachefile != '') AND !file_exists($cachefile)) {
$s = prepare_text($arr['body']); $s = prepare_text($arr['body']);
$a = get_app(); $a = get_app();
$stamp1 = microtime(true); $stamp1 = microtime(true);
file_put_contents($cachefile, $s); file_put_contents($cachefile, $s);
$a->save_timestamp($stamp1, "file"); $a->save_timestamp($stamp1, "file");
logger('item_store: put item '.$current_post.' into cachefile '.$cachefile); logger('item_store: put item '.$current_post.' into cachefile '.$cachefile);
} }
$r = q('SELECT * FROM `item` WHERE id = %d', intval($current_post)); $r = q('SELECT * FROM `item` WHERE id = %d', intval($current_post));
if (count($r) == 1) { if (count($r) == 1) {
@ -1201,7 +1205,7 @@ function item_store($arr,$force_parent = false) {
else { else {
logger('item_store: new item not found in DB, id ' . $current_post); logger('item_store: new item not found in DB, id ' . $current_post);
} }
}
return $current_post; return $current_post;
} }
@ -1217,10 +1221,15 @@ function get_item_contact($item,$contacts) {
return false; return false;
} }
/**
* look for mention tags and setup a second delivery chain for forum/community posts if appropriate
* @param int $uid
* @param int $item_id
* @return bool true if item was deleted, else false
*/
function tag_deliver($uid,$item_id) { function tag_deliver($uid,$item_id) {
// look for mention tags and setup a second delivery chain for forum/community posts if appropriate //
$a = get_app(); $a = get_app();
@ -1262,8 +1271,21 @@ function tag_deliver($uid,$item_id) {
} }
} }
if(! $mention) if(! $mention){
if ( ($community_page || $prvgroup) &&
(!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])){
// mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment)
// delete it!
logger("tag_deliver: no-mention top-level post to communuty or private group. delete.");
q("DELETE FROM item WHERE id = %d and uid = %d limit 1",
intval($item_id),
intval($uid)
);
return true;
}
return; return;
}
// send a notification // send a notification