Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 05:43:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Shadow entry mechanism improved

Browse source
This commit is contained in:
Michael 2016-10-29 21:27:56 +00:00
parent 7bd79c67a7
commit 8ab90f02c3
3 changed files with 33 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/items.php
View file

@ -938,7 +938,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
if ($arr['parent-uri'] === $arr['uri']) { if ($arr['parent-uri'] === $arr['uri']) {
add_shadow_thread($current_post); add_shadow_thread($current_post);
} else { } else {
add_shadow_entry($arr); add_shadow_entry($current_post);
} }
check_item_notification($current_post, $uid); check_item_notification($current_post, $uid);

22
include/threads.php
View file

@ -97,7 +97,15 @@ function add_shadow_thread($itemid) {
unset($item[0]['id']); unset($item[0]['id']);
$item[0]['uid'] = 0; $item[0]['uid'] = 0;
$item[0]['origin'] = 0; $item[0]['origin'] = 0;
$item[0]['wall'] = 0;
$item[0]['contact-id'] = get_contact($item[0]['author-link'], 0); $item[0]['contact-id'] = get_contact($item[0]['author-link'], 0);
if (in_array($item[0]['type'], array("net-comment", "wall-comment"))) {
$item[0]['type'] = 'remote-comment';
} elseif ($item[0]['type'] == 'wall') {
$item[0]['type'] = 'remote';
}
$public_shadow = item_store($item[0], false, false, true); $public_shadow = item_store($item[0], false, false, true);
logger("Stored public shadow for thread ".$itemid." under id ".$public_shadow, LOGGER_DEBUG); logger("Stored public shadow for thread ".$itemid." under id ".$public_shadow, LOGGER_DEBUG);
@ -105,7 +113,10 @@ function add_shadow_thread($itemid) {
} }
} }
function add_shadow_entry($item) { function add_shadow_entry($itemid) {
$items = q("SELECT * FROM `item` WHERE `id` = %d", intval($itemid));
$item = $items[0];
// Is this a shadow entry? // Is this a shadow entry?
if ($item['uid'] == 0) if ($item['uid'] == 0)
@ -127,7 +138,16 @@ function add_shadow_entry($item) {
unset($item['id']); unset($item['id']);
$item['uid'] = 0; $item['uid'] = 0;
$item['origin'] = 0;
$item['wall'] = 0;
$item['contact-id'] = get_contact($item['author-link'], 0); $item['contact-id'] = get_contact($item['author-link'], 0);
if (in_array($item['type'], array("net-comment", "wall-comment"))) {
$item['type'] = 'remote-comment';
} elseif ($item['type'] == 'wall') {
$item['type'] = 'remote';
}
$public_shadow = item_store($item, false, false, true); $public_shadow = item_store($item, false, false, true);
logger("Stored public shadow for comment ".$item['uri']." under id ".$public_shadow, LOGGER_DEBUG); logger("Stored public shadow for comment ".$item['uri']." under id ".$public_shadow, LOGGER_DEBUG);

50
mod/item.php
View file

@ -1009,50 +1009,22 @@ function item_post(&$a) {
} }
} }
if ($post_id == $parent) {
add_thread($post_id);
} else {
update_thread($parent, true);
}
q("COMMIT");
create_tags_from_item($post_id); create_tags_from_item($post_id);
create_files_from_item($post_id); create_files_from_item($post_id);
if ($post_id == $parent) { // Insert an item entry for UID=0 for global entries
add_thread($post_id); if ($post_id != $parent) {
q("COMMIT");
add_shadow_thread($post_id); add_shadow_thread($post_id);
} else { } else {
update_thread($parent, true); add_shadow_entry($post_id);
q("COMMIT");
// Insert an item entry for UID=0 for global entries
// We have to remove or change some data before that,
// so that the post appear like a regular received post.
// Additionally there is some data that isn't a database field.
$arr = $datarray;
$arr['app'] = $arr['source'];
unset($arr['source']);
unset($arr['self']);
unset($arr['wall']);
unset($arr['origin']);
unset($arr['api_source']);
unset($arr['message_id']);
unset($arr['profile_uid']);
unset($arr['post_id']);
unset($arr['dropitems']);
unset($arr['commenter']);
unset($arr['return']);
unset($arr['preview']);
unset($arr['post_id_random']);
unset($arr['emailcc']);
unset($arr['pubmail_enable']);
unset($arr['category']);
unset($arr['jsreload']);
if (in_array($arr['type'], array("net-comment", "wall-comment"))) {
$arr['type'] = 'remote-comment';
} elseif ($arr['type'] == 'wall') {
$arr['type'] = 'remote';
}
add_shadow_entry($arr);
} }
// This is a real juggling act on shared hosting services which kill your processes // This is a real juggling act on shared hosting services which kill your processes