Browse Source

The "file" variable isn't stored anymore in the item table

pull/5310/head
Michael 3 years ago
parent
commit
bffdf96d87
6 changed files with 76 additions and 91 deletions
  1. +1
    -1
      boot.php
  2. +1
    -4
      database.sql
  3. +5
    -5
      mod/network.php
  4. +0
    -3
      src/Database/DBStructure.php
  5. +64
    -77
      src/Model/Item.php
  6. +5
    -1
      src/Model/Term.php

+ 1
- 1
boot.php View File

@ -41,7 +41,7 @@ define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily');
define('FRIENDICA_VERSION', '2018.08-dev');
define('DFRN_PROTOCOL_VERSION', '2.23');
define('DB_UPDATE_VERSION', 1273);
define('DB_UPDATE_VERSION', 1274);
define('NEW_UPDATE_ROUTINE_VERSION', 1170);
/**


+ 1
- 4
database.sql View File

@ -1,6 +1,6 @@
-- ------------------------------------------
-- Friendica 2018.08-dev (The Tazmans Flax-lily)
-- DB_UPDATE_VERSION 1273
-- DB_UPDATE_VERSION 1274
-- ------------------------------------------
@ -536,9 +536,6 @@ CREATE TABLE IF NOT EXISTS `item` (
INDEX `ownerid` (`owner-id`),
INDEX `uid_uri` (`uid`,`uri`(190)),
INDEX `resource-id` (`resource-id`),
INDEX `contactid_allowcid_allowpid_denycid_denygid` (`contact-id`,`allow_cid`(10),`allow_gid`(10),`deny_cid`(10),`deny_gid`(10)),
INDEX `uid_type_changed` (`uid`,`type`,`changed`),
INDEX `contactid_verb` (`contact-id`,`verb`),
INDEX `deleted_changed` (`deleted`,`changed`),
INDEX `uid_wall_changed` (`uid`,`wall`,`changed`),
INDEX `uid_eventid` (`uid`,`event-id`),


+ 5
- 5
mod/network.php View File

@ -360,21 +360,21 @@ function network_content(App $a, $update = 0, $parent = 0)
$arr = ['query' => $a->query_string];
Addon::callHooks('network_content_init', $arr);
$nouveau = false;
$flat_mode = false;
if ($a->argc > 1) {
for ($x = 1; $x < $a->argc; $x ++) {
if ($a->argv[$x] === 'new') {
$nouveau = true;
$flat_mode = true;
}
}
}
if (x($_GET, 'file')) {
$nouveau = true;
$flat_mode = true;
}
if ($nouveau) {
if ($flat_mode) {
$o = networkFlatView($a, $update);
} else {
$o = networkThreadedView($a, $update, $parent);
@ -393,7 +393,7 @@ function network_content(App $a, $update = 0, $parent = 0)
function networkFlatView(App $a, $update = 0)
{
// Rawmode is used for fetching new content at the end of the page
$rawmode = (isset($_GET['mode']) AND ( $_GET['mode'] == 'raw'));
$rawmode = (isset($_GET['mode']) && ($_GET['mode'] == 'raw'));
if (isset($_GET['last_id'])) {
$last_id = intval($_GET['last_id']);


+ 0
- 3
src/Database/DBStructure.php View File

@ -1242,9 +1242,6 @@ class DBStructure
"ownerid" => ["owner-id"],
"uid_uri" => ["uid", "uri(190)"],
"resource-id" => ["resource-id"],
"contactid_allowcid_allowpid_denycid_denygid" => ["contact-id","allow_cid(10)","allow_gid(10)","deny_cid(10)","deny_gid(10)"], //
"uid_type_changed" => ["uid","type","changed"],
"contactid_verb" => ["contact-id","verb"],
"deleted_changed" => ["deleted","changed"],
"uid_wall_changed" => ["uid","wall","changed"],
"uid_eventid" => ["uid","event-id"],


+ 64
- 77
src/Model/Item.php View File

@ -122,11 +122,10 @@ class Item extends BaseObject
$row['tag'] = Term::tagTextFromItemId($row['id']);
}
/// @todo This is a preparation
// Build the file string out of the term entries
//if (isset($row['id']) && array_key_exists('file', $row)) {
// $row['file'] = Term::fileTextFromItemId($row['id']);
//}
if (isset($row['id']) && array_key_exists('file', $row)) {
$row['file'] = Term::fileTextFromItemId($row['id']);
}
// We can always comment on posts from these networks
if (isset($row['writable']) && !empty($row['network']) &&
@ -541,11 +540,10 @@ class Item extends BaseObject
$selected[] = 'id';
}
/// @todo This is a preparation
// To be able to fetch the files we need the item id
//if (in_array('file', $selected) && !in_array('id', $selected)) {
// $selected[] = 'id';
//}
if (in_array('file', $selected) && !in_array('id', $selected)) {
$selected[] = 'id';
}
$selection = [];
foreach ($fields as $table => $table_fields) {
@ -635,8 +633,7 @@ class Item extends BaseObject
if (array_key_exists('file', $fields)) {
$files = $fields['file'];
/// @todo This is a preparation
//unset($fields['file']);
unset($fields['file']);
} else {
$files = '';
}
@ -1393,8 +1390,7 @@ class Item extends BaseObject
if (array_key_exists('file', $item)) {
$files = $item['file'];
/// @todo This is a preparation
//unset($item['file']);
unset($item['file']);
} else {
$files = '';
}
@ -1766,7 +1762,7 @@ class Item extends BaseObject
*/
public static function addShadow($itemid)
{
$fields = ['uid', 'private', 'moderated', 'visible', 'deleted', 'network'];
$fields = ['uid', 'private', 'moderated', 'visible', 'deleted', 'network', 'uri'];
$condition = ['id' => $itemid, 'parent' => [0, $itemid]];
$item = self::selectFirst($fields, $condition);
@ -1789,36 +1785,36 @@ class Item extends BaseObject
return;
}
if (self::exists(['uri' => $item['uri'], 'uid' => 0])) {
return;
}
$item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
if (DBM::is_result($item) && ($item["allow_cid"] == '') && ($item["allow_gid"] == '') &&
($item["deny_cid"] == '') && ($item["deny_gid"] == '')) {
if (!self::exists(['uri' => $item['uri'], 'uid' => 0])) {
// Preparing public shadow (removing user specific data)
$item['uid'] = 0;
unset($item['id']);
unset($item['parent']);
unset($item['wall']);
unset($item['mention']);
unset($item['origin']);
unset($item['starred']);
if ($item['uri'] == $item['parent-uri']) {
$item['contact-id'] = $item['owner-id'];
} else {
$item['contact-id'] = $item['author-id'];
}
if (DBM::is_result($item)) {
// Preparing public shadow (removing user specific data)
$item['uid'] = 0;
unset($item['id']);
unset($item['parent']);
unset($item['wall']);
unset($item['mention']);
unset($item['origin']);
unset($item['starred']);
if ($item['uri'] == $item['parent-uri']) {
$item['contact-id'] = $item['owner-id'];
} else {
$item['contact-id'] = $item['author-id'];
}
if (in_array($item['type'], ["net-comment", "wall-comment"])) {
$item['type'] = 'remote-comment';
} elseif ($item['type'] == 'wall') {
$item['type'] = 'remote';
}
if (in_array($item['type'], ["net-comment", "wall-comment"])) {
$item['type'] = 'remote-comment';
} elseif ($item['type'] == 'wall') {
$item['type'] = 'remote';
}
$public_shadow = self::insert($item, false, false, true);
$public_shadow = self::insert($item, 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);
}
}
@ -2108,8 +2104,6 @@ class Item extends BaseObject
$item = dba::fetch_first("SELECT `item`.`id`, `user`.`nickname` FROM `item`
INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
AND NOT `item`.`private` AND `item`.`wall`
AND `item`.`guid` = ?", $guid);
if (DBM::is_result($item)) {
@ -2411,17 +2405,8 @@ class Item extends BaseObject
private static function hasPermissions($obj)
{
return (
(
x($obj, 'allow_cid')
) || (
x($obj, 'allow_gid')
) || (
x($obj, 'deny_cid')
) || (
x($obj, 'deny_gid')
)
);
return !empty($obj['allow_cid']) || !empty($obj['allow_gid']) ||
!empty($obj['deny_cid']) || !empty($obj['deny_gid']);
}
private static function samePermissions($obj1, $obj2)
@ -2487,74 +2472,76 @@ class Item extends BaseObject
return;
}
$condition = ["`uid` = ? AND NOT `deleted` AND `id` = `parent` AND `gravity` = ?",
$uid, GRAVITY_PARENT];
/*
* $expire_network_only = save your own wall posts
* and just expire conversations started by others
*/
$expire_network_only = PConfig::get($uid,'expire', 'network_only');
$sql_extra = (intval($expire_network_only) ? " AND wall = 0 " : "");
$expire_network_only = PConfig::get($uid, 'expire', 'network_only', false);
if ($expire_network_only) {
$condition[0] .= " AND NOT `wall`";
}
if ($network != "") {
$sql_extra .= sprintf(" AND network = '%s' ", dbesc($network));
$condition[0] .= " AND `network` = ?";
$condition[] = $network;
/*
* There is an index "uid_network_received" but not "uid_network_created"
* This avoids the creation of another index just for one purpose.
* And it doesn't really matter wether to look at "received" or "created"
*/
$range = "AND `received` < UTC_TIMESTAMP() - INTERVAL %d DAY ";
$condition[0] .= " AND `received` < UTC_TIMESTAMP() - INTERVAL ? DAY";
$condition[] = $days;
} else {
$range = "AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY ";
$condition[0] .= " AND `created` < UTC_TIMESTAMP() - INTERVAL ? DAY";
$condition[] = $days;
}
$r = q("SELECT `file`, `resource-id`, `starred`, `type`, `id` FROM `item`
WHERE `uid` = %d $range
AND `id` = `parent`
$sql_extra
AND `deleted` = 0",
intval($uid),
intval($days)
);
$items = self::select(['file', 'resource-id', 'starred', 'type', 'id'], $condition);
if (!DBM::is_result($r)) {
if (!DBM::is_result($items)) {
return;
}
$expire_items = PConfig::get($uid, 'expire', 'items', 1);
$expire_items = PConfig::get($uid, 'expire', 'items', true);
// Forcing expiring of items - but not notes and marked items
if ($force) {
$expire_items = true;
}
$expire_notes = PConfig::get($uid, 'expire', 'notes', 1);
$expire_starred = PConfig::get($uid, 'expire', 'starred', 1);
$expire_photos = PConfig::get($uid, 'expire', 'photos', 0);
$expire_notes = PConfig::get($uid, 'expire', 'notes', true);
$expire_starred = PConfig::get($uid, 'expire', 'starred', true);
$expire_photos = PConfig::get($uid, 'expire', 'photos', false);
logger('User '.$uid.': expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
foreach ($r as $item) {
logger('User ' . $uid . ": expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
while ($item = Item::fetch($items)) {
// don't expire filed items
if (strpos($item['file'],'[') !== false) {
if (strpos($item['file'], '[') !== false) {
continue;
}
// Only expire posts, not photos and photo comments
if ($expire_photos == 0 && strlen($item['resource-id'])) {
if (!$expire_photos && strlen($item['resource-id'])) {
continue;
} elseif ($expire_starred == 0 && intval($item['starred'])) {
} elseif (!$expire_starred && intval($item['starred'])) {
continue;
} elseif ($expire_notes == 0 && $item['type'] == 'note') {
} elseif (!$expire_notes && $item['type'] == 'note') {
continue;
} elseif ($expire_items == 0 && $item['type'] != 'note') {
} elseif (!$expire_items && $item['type'] != 'note') {
continue;
}
self::deleteById($item['id'], PRIORITY_LOW);
}
dba::close($items);
}
public static function firstPostDate($uid, $wall = false)


+ 5
- 1
src/Model/Term.php View File

@ -41,7 +41,11 @@ class Term
$condition = ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_FILE, TERM_CATEGORY]];
$tags = dba::select('term', [], $condition);
while ($tag = dba::fetch($tags)) {
$file_text .= '[' . $tag['term'] . ']';
if ($tag['type'] == TERM_CATEGORY) {
$file_text .= '<' . $tag['term'] . '>';
} else {
$file_text .= '[' . $tag['term'] . ']';
}
}
return $file_text;
}


Loading…
Cancel
Save