Update function for creating the shadow entries.
This commit is contained in:
parent
d054ac8d9c
commit
043c406091
5 changed files with 80 additions and 31 deletions
|
@ -1044,7 +1044,7 @@ function encode_rel_links($links) {
|
|||
|
||||
|
||||
|
||||
function item_store($arr,$force_parent = false, $notify = false) {
|
||||
function item_store($arr,$force_parent = false, $notify = false, $dontcache = false) {
|
||||
|
||||
// If it is a posting where users should get notifications, then define it as wall posting
|
||||
if ($notify) {
|
||||
|
@ -1469,7 +1469,7 @@ function item_store($arr,$force_parent = false, $notify = false) {
|
|||
|
||||
// current post can be deleted if is for a communuty page and no mention are
|
||||
// in it.
|
||||
if (!$deleted) {
|
||||
if (!$deleted AND !$dontcache) {
|
||||
|
||||
// Store the fresh generated item into the cache
|
||||
$cachefile = get_cachefile(urlencode($arr["guid"])."-".hash("md5", $arr['body']));
|
||||
|
@ -1491,7 +1491,7 @@ function item_store($arr,$force_parent = false, $notify = false) {
|
|||
}
|
||||
}
|
||||
|
||||
create_tags_from_item($current_post);
|
||||
create_tags_from_item($current_post, $dontcache);
|
||||
create_files_from_item($current_post);
|
||||
|
||||
if ($notify)
|
||||
|
|
22
include/shadowupdate.php
Normal file
22
include/shadowupdate.php
Normal file
|
@ -0,0 +1,22 @@
|
|||
<?php
|
||||
require_once("boot.php");
|
||||
require_once("include/threads.php");
|
||||
|
||||
global $a, $db;
|
||||
|
||||
if(is_null($a))
|
||||
$a = new App;
|
||||
|
||||
if(is_null($db)) {
|
||||
@include(".htconfig.php");
|
||||
require_once("include/dba.php");
|
||||
$db = new dba($db_host, $db_user, $db_pass, $db_data);
|
||||
unset($db_host, $db_user, $db_pass, $db_data);
|
||||
}
|
||||
|
||||
load_config('config');
|
||||
load_config('system');
|
||||
|
||||
update_shadow_copy();
|
||||
killme();
|
||||
?>
|
|
@ -1,5 +1,5 @@
|
|||
<?php
|
||||
function create_tags_from_item($itemid) {
|
||||
function create_tags_from_item($itemid, $dontcache = false) {
|
||||
global $a;
|
||||
|
||||
$profile_base = $a->get_baseurl();
|
||||
|
@ -26,14 +26,16 @@ function create_tags_from_item($itemid) {
|
|||
if ($message["deleted"])
|
||||
return;
|
||||
|
||||
$cachefile = get_cachefile(urlencode($message["guid"])."-".hash("md5", $message['body']));
|
||||
if (!$dontcache) {
|
||||
$cachefile = get_cachefile(urlencode($message["guid"])."-".hash("md5", $message['body']));
|
||||
|
||||
if (($cachefile != '') AND !file_exists($cachefile)) {
|
||||
$s = prepare_text($message['body']);
|
||||
$stamp1 = microtime(true);
|
||||
file_put_contents($cachefile, $s);
|
||||
$a->save_timestamp($stamp1, "file");
|
||||
logger('create_tags_from_item: put item '.$message["id"].' into cachefile '.$cachefile);
|
||||
if (($cachefile != '') AND !file_exists($cachefile)) {
|
||||
$s = prepare_text($message['body']);
|
||||
$stamp1 = microtime(true);
|
||||
file_put_contents($cachefile, $s);
|
||||
$a->save_timestamp($stamp1, "file");
|
||||
logger('create_tags_from_item: put item '.$message["id"].' into cachefile '.$cachefile);
|
||||
}
|
||||
}
|
||||
|
||||
$taglist = explode(",", $message["tag"]);
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?php
|
||||
function add_thread($itemid) {
|
||||
function add_thread($itemid, $onlyshadow = false) {
|
||||
$items = q("SELECT `uid`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`,
|
||||
`deleted`, `origin`, `forum_mode`, `mention`, `network` FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid));
|
||||
|
||||
|
@ -9,13 +9,15 @@ function add_thread($itemid) {
|
|||
$item = $items[0];
|
||||
$item['iid'] = $itemid;
|
||||
|
||||
$result = dbq("INSERT INTO `thread` (`"
|
||||
.implode("`, `", array_keys($item))
|
||||
."`) VALUES ('"
|
||||
.implode("', '", array_values($item))
|
||||
."')");
|
||||
if (!$onlyshadow) {
|
||||
$result = dbq("INSERT INTO `thread` (`"
|
||||
.implode("`, `", array_keys($item))
|
||||
."`) VALUES ('"
|
||||
.implode("', '", array_values($item))
|
||||
."')");
|
||||
|
||||
logger("add_thread: Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
|
||||
logger("add_thread: Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
|
||||
}
|
||||
|
||||
// Store a shadow copy of public items for displaying a global community page?
|
||||
if (!get_config('system', 'global_community'))
|
||||
|
@ -25,12 +27,23 @@ function add_thread($itemid) {
|
|||
if (($itemid == 0) OR ($item['uid'] == 0))
|
||||
return;
|
||||
|
||||
// Check, if hide-friends is activated - then don't do a shadow entry
|
||||
$r = q("SELECT `hide-friends` FROM `profile` WHERE `is-default` AND `uid` = %d AND NOT `hide-friends`",
|
||||
$item['uid']);
|
||||
if (!count($r))
|
||||
// Is it a visible public post?
|
||||
if (!$item["visible"] OR $item["deleted"] OR $item["moderated"] OR $item["private"])
|
||||
return;
|
||||
|
||||
// is it an entry from a connector? Only add an entry for natively connected networks
|
||||
if (!in_array($item["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED, "")))
|
||||
return;
|
||||
|
||||
// Check, if hide-friends is activated - then don't do a shadow entry
|
||||
// Only do this check if the post isn't a wall post
|
||||
if (!$item["wall"]) {
|
||||
$r = q("SELECT `hide-friends` FROM `profile` WHERE `is-default` AND `uid` = %d AND NOT `hide-friends`",
|
||||
$item['uid']);
|
||||
if (!count($r))
|
||||
return;
|
||||
}
|
||||
|
||||
// Only add a shadow, if the profile isn't hidden
|
||||
$r = q("SELECT `uid` FROM `user` where `uid` = %d AND NOT `hidewall`", $item['uid']);
|
||||
if (!count($r))
|
||||
|
@ -39,10 +52,8 @@ function add_thread($itemid) {
|
|||
$item = q("SELECT * FROM `item` WHERE `id` = %d",
|
||||
intval($itemid));
|
||||
|
||||
if (count($item) AND ($item[0]["visible"] == 1) AND ($item[0]["deleted"] == 0) AND
|
||||
(($item[0]["id"] == $item[0]["parent"]) OR ($item[0]["parent"] == 0)) AND
|
||||
($item[0]["moderated"] == 0) AND ($item[0]["allow_cid"] == '') AND ($item[0]["allow_gid"] == '') AND
|
||||
($item[0]["deny_cid"] == '') AND ($item[0]["deny_gid"] == '') AND ($item[0]["private"] == 0)) {
|
||||
if (count($item) AND ($item[0]["allow_cid"] == '') AND ($item[0]["allow_gid"] == '') AND
|
||||
($item[0]["deny_cid"] == '') AND ($item[0]["deny_gid"] == '')) {
|
||||
|
||||
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1",
|
||||
dbesc($item['uri']));
|
||||
|
@ -53,8 +64,8 @@ function add_thread($itemid) {
|
|||
unset($item[0]['id']);
|
||||
$item[0]['uid'] = 0;
|
||||
$item[0]['contact-id'] = 0;
|
||||
$public_shadow = item_store($item[0], false, false, true);
|
||||
|
||||
$public_shadow = item_store($item[0],false);
|
||||
logger("add_thread: Stored public shadow for post ".$itemid." under id ".$public_shadow, LOGGER_DEBUG);
|
||||
}
|
||||
}
|
||||
|
@ -187,4 +198,21 @@ function update_threads_mention() {
|
|||
q("UPDATE `thread` SET `mention` = 1 WHERE `iid` = %d", $parent["parent"]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function update_shadow_copy() {
|
||||
global $db;
|
||||
|
||||
logger("start");
|
||||
|
||||
$messages = $db->q(sprintf("SELECT `iid` FROM `thread` WHERE `uid` != 0 AND `network` IN ('', '%s', '%s', '%s', '%s')
|
||||
AND `visible` AND NOT `deleted` AND NOT `moderated` AND NOT `private` ORDER BY `created`",
|
||||
NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_FEED, NETWORK_OSTATUS), true);
|
||||
|
||||
logger("fetched messages: ".count($messages));
|
||||
while ($message = $db->qfetch())
|
||||
add_thread($message["iid"], true);
|
||||
|
||||
$db->qclose();
|
||||
}
|
||||
?>
|
||||
|
|
|
@ -145,13 +145,10 @@ function community_getpublicitems($start, $itemspage) {
|
|||
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
|
||||
`author-name` AS `name`, `owner-avatar` AS `photo`,
|
||||
`owner-link` AS `url`, `owner-avatar` AS `thumb`
|
||||
FROM `item` WHERE `item`.`uid` = 0 AND `network` IN ('%s', '%s', '%s')
|
||||
FROM `item` WHERE `item`.`uid` = 0
|
||||
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
|
||||
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
|
||||
ORDER BY `item`.`received` DESC LIMIT %d, %d",
|
||||
dbesc(NETWORK_DFRN),
|
||||
dbesc(NETWORK_DIASPORA),
|
||||
dbesc(NETWORK_OSTATUS),
|
||||
intval($start),
|
||||
intval($itemspage)
|
||||
);
|
||||
|
|
Loading…
Reference in a new issue