// All fields in the item table
const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid', 'psid',
- 'created', 'edited', 'commented', 'received', 'changed', 'verb',
+ 'uri-hash', 'created', 'edited', 'commented', 'received', 'changed', 'verb',
'postopts', 'plink', 'resource-id', 'event-id', 'tag', 'attach', 'inform',
'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'post-type',
'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
* @param string $activity activity string
* @return integer Activity index
*/
- private static function activityToIndex($activity)
+ public static function activityToIndex($activity)
{
$index = array_search($activity, self::ACTIVITIES);
// We can always comment on posts from these networks
if (array_key_exists('writable', $row) &&
- in_array($row['internal-network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
+ in_array($row['internal-network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
$row['writable'] = true;
}
$fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
'contact-id', 'owner-id', 'author-id', 'type', 'wall', 'gravity', 'extid',
- 'created', 'edited', 'commented', 'received', 'changed', 'psid',
+ 'created', 'edited', 'commented', 'received', 'changed', 'psid', 'uri-hash',
'resource-id', 'event-id', 'tag', 'attach', 'post-type', 'file',
'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global',
} else {
$master_table = "`item`";
}
- return "$master_table.`visible` AND NOT $master_table.`deleted` AND NOT $master_table.`moderated` AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`) ";
+ return sprintf("$master_table.`visible` AND NOT $master_table.`deleted` AND NOT $master_table.`moderated`
+ AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`)
+ AND (`user-author`.`blocked` IS NULL OR NOT `user-author`.`blocked`)
+ AND (`user-author`.`ignored` IS NULL OR NOT `user-author`.`ignored` OR `item`.`gravity` != %d)
+ AND (`user-owner`.`blocked` IS NULL OR NOT `user-owner`.`blocked`)
+ AND (`user-owner`.`ignored` IS NULL OR NOT `user-owner`.`ignored` OR `item`.`gravity` != %d) ",
+ GRAVITY_PARENT, GRAVITY_PARENT);
}
/**
OR `contact`.`self` OR `item`.`gravity` != %d OR `contact`.`uid` = 0)
STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id` AND NOT `author`.`blocked`
STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id` AND NOT `owner`.`blocked`
- LEFT JOIN `user-item` ON `user-item`.`iid` = $master_table_key AND `user-item`.`uid` = %d",
- Contact::SHARING, Contact::FRIEND, GRAVITY_PARENT, intval($uid));
+ LEFT JOIN `user-item` ON `user-item`.`iid` = $master_table_key AND `user-item`.`uid` = %d
+ LEFT JOIN `user-contact` AS `user-author` ON `user-author`.`cid` = $master_table.`author-id` AND `user-author`.`uid` = %d
+ LEFT JOIN `user-contact` AS `user-owner` ON `user-owner`.`cid` = $master_table.`owner-id` AND `user-owner`.`uid` = %d",
+ Contact::SHARING, Contact::FRIEND, GRAVITY_PARENT, intval($uid), intval($uid), intval($uid));
} else {
if (strpos($sql_commands, "`contact`.") !== false) {
$joins .= "LEFT JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`";
*/
public static function delete($condition, $priority = PRIORITY_HIGH)
{
- $items = DBA::select('item', ['id'], $condition);
- while ($item = DBA::fetch($items)) {
+ $items = self::select(['id'], $condition);
+ while ($item = self::fetch($items)) {
self::deleteById($item['id'], $priority);
}
DBA::close($items);
return;
}
- $items = DBA::select('item', ['id', 'uid'], $condition);
- while ($item = DBA::fetch($items)) {
+ $items = self::select(['id', 'uid'], $condition);
+ while ($item = self::fetch($items)) {
// "Deleting" global items just means hiding them
if ($item['uid'] == 0) {
DBA::update('user-item', ['hidden' => true], ['iid' => $item['id'], 'uid' => $uid], true);
DBA::delete('item-delivery-data', ['iid' => $item['id']]);
- if (!empty($item['iaid']) && !DBA::exists('item', ['iaid' => $item['iaid'], 'deleted' => false])) {
- DBA::delete('item-activity', ['id' => $item['iaid']], ['cascade' => false]);
- }
- if (!empty($item['icid']) && !DBA::exists('item', ['icid' => $item['icid'], 'deleted' => false])) {
+ // We don't delete the item-activity here, since we need some of the data for ActivityPub
+
+ if (!empty($item['icid']) && !self::exists(['icid' => $item['icid'], 'deleted' => false])) {
DBA::delete('item-content', ['id' => $item['icid']], ['cascade' => false]);
}
// When the permission set will be used in photo and events as well,
// this query here needs to be extended.
- if (!empty($item['psid']) && !DBA::exists('item', ['psid' => $item['psid'], 'deleted' => false])) {
+ if (!empty($item['psid']) && !self::exists(['psid' => $item['psid'], 'deleted' => false])) {
DBA::delete('permissionset', ['id' => $item['psid']], ['cascade' => false]);
}
} elseif (!empty($item['uri'])) {
$guid = self::guidFromUri($item['uri'], $prefix_host);
} else {
- $guid = System::createGUID(32, hash('crc32', $prefix_host));
+ $guid = System::createUUID(hash('crc32', $prefix_host));
}
return $guid;
* We have to check several networks since Friendica posts could be repeated
* via OStatus (maybe Diasporsa as well)
*/
- if (in_array($item['network'], [Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS, ""])) {
+ if (in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS, ""])) {
$condition = ["`uri` = ? AND `uid` = ? AND `network` IN (?, ?, ?)",
trim($item['uri']), $item['uid'],
Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS];
}
// Ensure to always have the same creation date.
- $existing = DBA::selectfirst('item', ['created', 'uri-hash'], ['uri' => $item['uri']]);
+ $existing = self::selectfirst(['created', 'uri-hash'], ['uri' => $item['uri']]);
if (DBA::isResult($existing)) {
$item['created'] = $existing['created'];
$item['uri-hash'] = $existing['uri-hash'];
return 0;
}
- // These fields aren't stored anymore in the item table, they are fetched upon request
- unset($item['author-link']);
- unset($item['author-name']);
- unset($item['author-avatar']);
-
- unset($item['owner-link']);
- unset($item['owner-name']);
- unset($item['owner-avatar']);
-
if ($item['network'] == Protocol::PHANTOM) {
logger('Missing network. Called by: '.System::callstack(), LOGGER_DEBUG);
$item["global"] = true;
// Set the global flag on all items if this was a global item entry
- DBA::update('item', ['global' => true], ['uri' => $item["uri"]]);
+ self::update(['global' => true], ['uri' => $item["uri"]]);
} else {
$item["global"] = self::exists(['uid' => 0, 'uri' => $item["uri"]]);
}
unset($item['postopts']);
unset($item['inform']);
+ // These fields aren't stored anymore in the item table, they are fetched upon request
+ unset($item['author-link']);
+ unset($item['author-name']);
+ unset($item['author-avatar']);
+
+ unset($item['owner-link']);
+ unset($item['owner-name']);
+ unset($item['owner-avatar']);
+
DBA::transaction();
$ret = DBA::insert('item', $item);
}
// Set parent id
- DBA::update('item', ['parent' => $parent_id], ['id' => $current_post]);
+ self::update(['parent' => $parent_id], ['id' => $current_post]);
$item['id'] = $current_post;
$item['parent'] = $parent_id;
// update the commented timestamp on the parent
// Only update "commented" if it is really a comment
if (($item['gravity'] != GRAVITY_ACTIVITY) || !Config::get("system", "like_no_comment")) {
- DBA::update('item', ['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
+ self::update(['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
} else {
- DBA::update('item', ['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
+ self::update(['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
}
if ($dsprsig) {
} else {
// This shouldn't happen.
logger('Could not insert activity for URI ' . $item['uri'] . ' - should not happen');
+ Lock::release('item_insert_activity');
return false;
}
if ($locked) {
// Only distribute public items from native networks
$condition = ['id' => $itemid, 'uid' => 0,
- 'network' => [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""],
+ 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""],
'visible' => true, 'deleted' => false, 'moderated' => false, 'private' => false];
$item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
if (!DBA::isResult($item)) {
$users = [];
- $condition = ["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND `rel` IN (?, ?)",
- $parent['owner-id'], Contact::SHARING, Contact::FRIEND];
+ /// @todo add a field "pcid" in the contact table that referrs to the public contact id.
+ $owner = DBA::selectFirst('contact', ['url', 'nurl', 'alias'], ['id' => $parent['owner-id']]);
+ if (!DBA::isResult($owner)) {
+ return;
+ }
+ $condition = ['nurl' => $owner['nurl'], 'rel' => [Contact::SHARING, Contact::FRIEND]];
$contacts = DBA::select('contact', ['uid'], $condition);
+ while ($contact = DBA::fetch($contacts)) {
+ if ($contact['uid'] == 0) {
+ continue;
+ }
+
+ $users[$contact['uid']] = $contact['uid'];
+ }
+ DBA::close($contacts);
+ $condition = ['alias' => $owner['url'], 'rel' => [Contact::SHARING, Contact::FRIEND]];
+ $contacts = DBA::select('contact', ['uid'], $condition);
while ($contact = DBA::fetch($contacts)) {
+ if ($contact['uid'] == 0) {
+ continue;
+ }
+
$users[$contact['uid']] = $contact['uid'];
}
+ DBA::close($contacts);
+
+ if (!empty($owner['alias'])) {
+ $condition = ['url' => $owner['alias'], 'rel' => [Contact::SHARING, Contact::FRIEND]];
+ $contacts = DBA::select('contact', ['uid'], $condition);
+ while ($contact = DBA::fetch($contacts)) {
+ if ($contact['uid'] == 0) {
+ continue;
+ }
+
+ $users[$contact['uid']] = $contact['uid'];
+ }
+ DBA::close($contacts);
+ }
$origin_uid = 0;
if ($item['uri'] != $item['parent-uri']) {
$parents = self::select(['uid', 'origin'], ["`uri` = ? AND `uid` != 0", $item['parent-uri']]);
- while ($parent = DBA::fetch($parents)) {
+ while ($parent = self::fetch($parents)) {
$users[$parent['uid']] = $parent['uid'];
if ($parent['origin'] && !$origin) {
$origin_uid = $parent['uid'];
}
// is it an entry from a connector? Only add an entry for natively connected networks
- if (!in_array($item["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
+ if (!in_array($item["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
return;
}
public static function newURI($uid, $guid = "")
{
if ($guid == "") {
- $guid = System::createGUID(32);
+ $guid = System::createUUID();
}
- $hostname = self::getApp()->get_hostname();
-
- $user = DBA::selectFirst('user', ['nickname'], ['uid' => $uid]);
-
- $uri = "urn:X-dfrn:" . $hostname . ':' . $user['nickname'] . ':' . $guid;
-
- return $uri;
+ return self::getApp()->get_baseurl() . '/objects/' . $guid;
}
/**
}
}
+ /**
+ * This function is only used for the old Friendica app on Android that doesn't like paths with guid
+ * @param string $guid item guid
+ * @param int $uid user id
+ * @return array with id and nick of the item with the given guid
+ */
public static function getIdAndNickByGuid($guid, $uid = 0)
{
$nick = "";
// Does the given user have this item?
if ($uid) {
- $item = DBA::fetchFirst("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`.`guid` = ? AND `item`.`uid` = ?", $guid, $uid);
+ $item = self::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]);
if (DBA::isResult($item)) {
- $id = $item["id"];
- $nick = $item["nickname"];
+ $user = DBA::selectFirst('user', ['nickname'], ['uid' => $uid]);
+ if (!DBA::isResult($user)) {
+ return;
+ }
+ $id = $item['id'];
+ $nick = $user['nickname'];
}
}
// Or is it anywhere on the server?
if ($nick == "") {
- $item = DBA::fetchFirst("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 NOT `item`.`private` AND `item`.`wall`
- AND `item`.`guid` = ?", $guid);
+ $condition = ["`guid` = ? AND `uid` != 0", $guid];
+ $item = self::selectFirst(['id', 'uid'], $condition);
if (DBA::isResult($item)) {
- $id = $item["id"];
- $nick = $item["nickname"];
+ $user = DBA::selectFirst('user', ['nickname'], ['uid' => $item['uid']]);
+ if (!DBA::isResult($user)) {
+ return;
+ }
+ $id = $item['id'];
+ $nick = $user['nickname'];
}
}
return ["nick" => $nick, "id" => $id];
$private = ($user['allow_cid'] || $user['allow_gid'] || $user['deny_cid'] || $user['deny_gid']) ? 1 : 0;
+ $psid = PermissionSet::fetchIDForPost($user);
+
$forum_mode = ($prvgroup ? 2 : 1);
$fields = ['wall' => true, 'origin' => true, 'forum_mode' => $forum_mode, 'contact-id' => $self['id'],
- 'owner-id' => $owner_id, 'owner-link' => $self['url'], 'private' => $private, 'allow_cid' => $user['allow_cid'],
- 'allow_gid' => $user['allow_gid'], 'deny_cid' => $user['deny_cid'], 'deny_gid' => $user['deny_gid']];
- DBA::update('item', $fields, ['id' => $item_id]);
+ 'owner-id' => $owner_id, 'private' => $private, 'psid' => $psid];
+ self::update($fields, ['id' => $item_id]);
self::updateThread($item_id);
}
if ($contact['network'] != Protocol::FEED) {
- $datarray["guid"] = System::createGUID(32);
+ $datarray["guid"] = System::createUUID();
unset($datarray["plink"]);
$datarray["uri"] = self::newURI($contact['uid'], $datarray["guid"]);
$datarray["parent-uri"] = $datarray["uri"];
}
// returns an array of contact-ids that are allowed to see this object
- private static function enumeratePermissions($obj)
+ public static function enumeratePermissions($obj)
{
$allow_people = expand_acl($obj['allow_cid']);
$allow_groups = Group::expand(expand_acl($obj['allow_gid']));
$objtype = $item['resource-id'] ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ;
$new_item = [
- 'guid' => System::createGUID(32),
+ 'guid' => System::createUUID(),
'uri' => self::newURI($item['uid']),
'uid' => $item['uid'],
'contact-id' => $item_contact_id,
return;
}
- // Using dba::delete at this time could delete the associated item entries
- $result = DBA::e("DELETE FROM `thread` WHERE `iid` = ?", $itemid);
+ $result = DBA::delete('thread', ['iid' => $itemid], ['cascade' => false]);
logger("deleteThread: Deleted thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
projects / friendica.git / blobdiff