clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the item functions at many more places

This commit is contained in:
Michael 2018-06-18 20:36:34 +00:00
parent 68ab3764e9
commit 4714cb746b
13 changed files with 191 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
include/api.php
View File

@ -1122,18 +1122,8 @@ function api_statuses_update($type)
if ($throttle_day > 0) { if ($throttle_day > 0) {
$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60); $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60);
$r = q( $condition = ["`uid` = ? AND `wall` AND `created` > ? AND `id` = `parent`", api_user(), $datefrom];
"SELECT COUNT(*) AS `posts_day` FROM `item` WHERE `uid`=%d AND `wall` $posts_day = dba::count('item', $condition);
AND `created` > '%s' AND `id` = `parent`",
intval(api_user()),
dbesc($datefrom)
);
if (DBM::is_result($r)) {
$posts_day = $r[0]["posts_day"];
} else {
$posts_day = 0;
}
if ($posts_day > $throttle_day) { if ($posts_day > $throttle_day) {
logger('Daily posting limit reached for user '.api_user(), LOGGER_DEBUG); logger('Daily posting limit reached for user '.api_user(), LOGGER_DEBUG);
@ -1146,18 +1136,8 @@ function api_statuses_update($type)
if ($throttle_week > 0) { if ($throttle_week > 0) {
$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*7); $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*7);
$r = q( $condition = ["`uid` = ? AND `wall` AND `created` > ? AND `id` = `parent`", api_user(), $datefrom];
"SELECT COUNT(*) AS `posts_week` FROM `item` WHERE `uid`=%d AND `wall` $posts_week = dba::count('item', $condition);
AND `created` > '%s' AND `id` = `parent`",
intval(api_user()),
dbesc($datefrom)
);
if (DBM::is_result($r)) {
$posts_week = $r[0]["posts_week"];
} else {
$posts_week = 0;
}
if ($posts_week > $throttle_week) { if ($posts_week > $throttle_week) {
logger('Weekly posting limit reached for user '.api_user(), LOGGER_DEBUG); logger('Weekly posting limit reached for user '.api_user(), LOGGER_DEBUG);
@ -1170,18 +1150,8 @@ function api_statuses_update($type)
if ($throttle_month > 0) { if ($throttle_month > 0) {
$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*30); $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*30);
$r = q( $condition = ["`uid` = ? AND `wall` AND `created` > ? AND `id` = `parent`", api_user(), $datefrom];
"SELECT COUNT(*) AS `posts_month` FROM `item` WHERE `uid`=%d AND `wall` $posts_month = dba::count('item', $condition);
AND `created` > '%s' AND `id` = `parent`",
intval(api_user()),
dbesc($datefrom)
);
if (DBM::is_result($r)) {
$posts_month = $r[0]["posts_month"];
} else {
$posts_month = 0;
}
if ($posts_month > $throttle_month) { if ($posts_month > $throttle_month) {
logger('Monthly posting limit reached for user '.api_user(), LOGGER_DEBUG); logger('Monthly posting limit reached for user '.api_user(), LOGGER_DEBUG);
@ -2755,14 +2725,10 @@ function api_format_items_activities(&$item, $type = "json")
'attendmaybe' => [], 'attendmaybe' => [],
]; ];
$items = q( $condition = ['uid' => $item['uid'], 'thr-parent' => $item['uri']];
'SELECT * FROM `item` $ret = Item::selectForUser($item['uid'], ['author-id', 'verb'], $condition);
WHERE `uid` = %d AND `thr-parent` = "%s" AND `visible` AND NOT `deleted`',
intval($item['uid']),
dbesc($item['uri'])
);
foreach ($items as $i) { while ($i = dba::fetch($ret)) {
// not used as result should be structured like other user data // not used as result should be structured like other user data
//builtin_activity_puller($i, $activities); //builtin_activity_puller($i, $activities);
@ -2789,6 +2755,8 @@ function api_format_items_activities(&$item, $type = "json")
} }
} }
dba::close($ret);
if ($type == "xml") { if ($type == "xml") {
$xml_activities = []; $xml_activities = [];
foreach ($activities as $k => $v) { foreach ($activities as $k => $v) {
@ -3872,16 +3840,13 @@ function api_fr_photoalbum_delete($type)
// function for setting the items to "deleted = 1" which ensures that comments, likes etc. are not shown anymore // function for setting the items to "deleted = 1" which ensures that comments, likes etc. are not shown anymore
// to the user and the contacts of the users (drop_items() performs the federation of the deletion to other networks // to the user and the contacts of the users (drop_items() performs the federation of the deletion to other networks
foreach ($r as $rr) { foreach ($r as $rr) {
$photo_item = q( $condition = ['uid' => local_user(), 'resource-id' => $rr['resource-id'], 'type' => 'photo'];
"SELECT `id` FROM `item` WHERE `uid` = %d AND `resource-id` = '%s' AND `type` = 'photo'", $photo_item = Item::selectFirstForUser(local_user(), ['id'], $condition);
intval(local_user()),
dbesc($rr['resource-id'])
);
if (!DBM::is_result($photo_item)) { if (!DBM::is_result($photo_item)) {
throw new InternalServerErrorException("problem with deleting items occured"); throw new InternalServerErrorException("problem with deleting items occured");
} }
Item::deleteForUser(['id' => $photo_item[0]['id']], api_user()); Item::deleteForUser(['id' => $photo_item['id']], api_user());
} }
// now let's delete all photos from the album // now let's delete all photos from the album
@ -4162,18 +4127,15 @@ function api_fr_photo_delete($type)
// return success of deletion or error message // return success of deletion or error message
if ($result) { if ($result) {
// retrieve the id of the parent element (the photo element) // retrieve the id of the parent element (the photo element)
$photo_item = q( $condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo'];
"SELECT `id` FROM `item` WHERE `uid` = %d AND `resource-id` = '%s' AND `type` = 'photo'", $photo_item = Item::selectFirstForUser(local_user(), ['id'], $condition);
intval(local_user()),
dbesc($photo_id)
);
if (!DBM::is_result($photo_item)) { if (!DBM::is_result($photo_item)) {
throw new InternalServerErrorException("problem with deleting items occured"); throw new InternalServerErrorException("problem with deleting items occured");
} }
// function for setting the items to "deleted = 1" which ensures that comments, likes etc. are not shown anymore // function for setting the items to "deleted = 1" which ensures that comments, likes etc. are not shown anymore
// to the user and the contacts of the users (drop_items() do all the necessary magic to avoid orphans in database and federate deletion) // to the user and the contacts of the users (drop_items() do all the necessary magic to avoid orphans in database and federate deletion)
Item::deleteForUser(['id' => $photo_item[0]['id']], api_user()); Item::deleteForUser(['id' => $photo_item['id']], api_user());
$answer = ['result' => 'deleted', 'message' => 'photo with id `' . $photo_id . '` has been deleted from server.']; $answer = ['result' => 'deleted', 'message' => 'photo with id `' . $photo_id . '` has been deleted from server.'];
return api_format_data("photo_delete", $type, ['$result' => $answer]); return api_format_data("photo_delete", $type, ['$result' => $answer]);
@ -4661,12 +4623,10 @@ function prepare_photo_data($type, $scale, $photo_id)
} }
// retrieve item element for getting activities (like, dislike etc.) related to photo // retrieve item element for getting activities (like, dislike etc.) related to photo
$item = q( $condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo'];
"SELECT * FROM `item` WHERE `uid` = %d AND `resource-id` = '%s' AND `type` = 'photo'", $item = Item::selectFirstForUser(local_user(), ['id'], $condition);
intval(local_user()),
dbesc($photo_id) $data['photo']['friendica_activities'] = api_format_items_activities($item, $type);
);
$data['photo']['friendica_activities'] = api_format_items_activities($item[0], $type);
// retrieve comments on photo // retrieve comments on photo
$condition = ["`parent` = ? AND `uid` = ? AND (`verb` = ? OR `type`='photo')", $condition = ["`parent` = ? AND `uid` = ? AND (`verb` = ? OR `type`='photo')",
@ -4961,35 +4921,26 @@ function api_in_reply_to($item)
$in_reply_to['screen_name'] = null; $in_reply_to['screen_name'] = null;
if (($item['thr-parent'] != $item['uri']) && (intval($item['parent']) != intval($item['id']))) { if (($item['thr-parent'] != $item['uri']) && (intval($item['parent']) != intval($item['id']))) {
$r = q( $parent = Item::selectFirst(['id'], ['uid' => $item['uid'], 'uri' => $item['thr-parent']]);
"SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1", if (DBM::is_result($parent)) {
intval($item['uid']), $in_reply_to['status_id'] = intval($parent['id']);
dbesc($item['thr-parent'])
);
if (DBM::is_result($r)) {
$in_reply_to['status_id'] = intval($r[0]['id']);
} else { } else {
$in_reply_to['status_id'] = intval($item['parent']); $in_reply_to['status_id'] = intval($item['parent']);
} }
$in_reply_to['status_id_str'] = (string) intval($in_reply_to['status_id']); $in_reply_to['status_id_str'] = (string) intval($in_reply_to['status_id']);
$r = q( $fields = ['author-nick', 'author-name', 'author-id', 'author-link'];
"SELECT `contact`.`nick`, `contact`.`name`, `contact`.`id`, `contact`.`url` FROM `item` $parent = Item::selectFirst($fields, ['id' => $in_reply_to['status_id']]);
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`author-id`
WHERE `item`.`id` = %d LIMIT 1",
intval($in_reply_to['status_id'])
);
if (DBM::is_result($r)) { if (DBM::is_result($parent)) {
if ($r[0]['nick'] == "") { if ($parent['author-nick'] == "") {
$r[0]['nick'] = api_get_nick($r[0]["url"]); $parent['author-nick'] = api_get_nick($parent['author-link']);
} }
$in_reply_to['screen_name'] = (($r[0]['nick']) ? $r[0]['nick'] : $r[0]['name']); $in_reply_to['screen_name'] = (($parent['author-nick']) ? $parent['author-nick'] : $parent['author-name']);
$in_reply_to['user_id'] = intval($r[0]['id']); $in_reply_to['user_id'] = intval($parent['author-id']);
$in_reply_to['user_id_str'] = (string) intval($r[0]['id']); $in_reply_to['user_id_str'] = (string) intval($parent['author-id']);
} }
// There seems to be situation, where both fields are identical: // There seems to be situation, where both fields are identical:

10
include/conversation.php
View File

@ -633,16 +633,12 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
$location_e = $location; $location_e = $location;
$owner_name_e = $owner_name; $owner_name_e = $owner_name;
if ($item['item_network'] == "") {
$item['item_network'] = $item['network'];
}
$tmp_item = [ $tmp_item = [
'template' => $tpl, 'template' => $tpl,
'id' => (($preview) ? 'P0' : $item['item_id']), 'id' => (($preview) ? 'P0' : $item['item_id']),
'guid' => (($preview) ? 'Q0' : $item['guid']), 'guid' => (($preview) ? 'Q0' : $item['guid']),
'network' => $item['item_network'], 'network' => $item['network'],
'network_name' => ContactSelector::networkToName($item['item_network'], $profile_link), 'network_name' => ContactSelector::networkToName($item['network'], $profile_link),
'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']), 'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
'profile_url' => $profile_link, 'profile_url' => $profile_link,
'item_photo_menu' => item_photo_menu($item), 'item_photo_menu' => item_photo_menu($item),
@ -688,7 +684,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
Addon::callHooks('display_item', $arr); Addon::callHooks('display_item', $arr);
$threads[$threadsid]['id'] = $item['item_id']; $threads[$threadsid]['id'] = $item['item_id'];
$threads[$threadsid]['network'] = $item['item_network']; $threads[$threadsid]['network'] = $item['network'];
$threads[$threadsid]['items'] = [$arr['output']]; $threads[$threadsid]['items'] = [$arr['output']];
} }

10
include/items.php
View File

@ -335,17 +335,14 @@ function drop_item($id) {
// locate item to be deleted // locate item to be deleted
$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", $fields = ['id', 'uid', 'contact-id', 'deleted'];
intval($id) $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]);
);
if (!DBM::is_result($r)) { if (!DBM::is_result($item)) {
notice(L10n::t('Item not found.') . EOL); notice(L10n::t('Item not found.') . EOL);
goaway(System::baseUrl() . '/' . $_SESSION['return_url']); goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
} }
$item = $r[0];
if ($item['deleted']) { if ($item['deleted']) {
return 0; return 0;
} }
@ -364,7 +361,6 @@ function drop_item($id) {
} }
if ((local_user() == $item['uid']) || $contact_id) { if ((local_user() == $item['uid']) || $contact_id) {
// Check if we should do HTML-based delete confirmation // Check if we should do HTML-based delete confirmation
if ($_REQUEST['confirm']) { if ($_REQUEST['confirm']) {
// <form> can't take arguments in its "action" parameter // <form> can't take arguments in its "action" parameter

74
mod/display.php
View File

@ -43,6 +43,8 @@ function display_init(App $a)
$r = false; $r = false;
$fields = ['id', 'parent', 'author-id', 'body', 'uid'];
// If there is only one parameter, then check if this parameter could be a guid // If there is only one parameter, then check if this parameter could be a guid
if ($a->argc == 2) { if ($a->argc == 2) {
$nick = ""; $nick = "";
@ -50,9 +52,7 @@ function display_init(App $a)
// Does the local user have this item? // Does the local user have this item?
if (local_user()) { if (local_user()) {
$r = dba::fetch_first("SELECT `id`, `parent`, `author-id`, `body`, `uid` $r = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'uid' => local_user()]);
FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
AND `guid` = ? AND `uid` = ? LIMIT 1", $a->argv[1], local_user());
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$nick = $a->user["nickname"]; $nick = $a->user["nickname"];
} }
@ -60,54 +60,44 @@ function display_init(App $a)
// Is it an item with uid=0? // Is it an item with uid=0?
if (!DBM::is_result($r)) { if (!DBM::is_result($r)) {
$r = dba::fetch_first("SELECT `id`, `parent`, `author-id`, `body`, `uid` $r = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => false, 'uid' => 0]);
FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
AND NOT `private` AND `uid` = 0
AND `guid` = ? LIMIT 1", $a->argv[1]);
}
if (!DBM::is_result($r)) {
$a->error = 404;
notice(L10n::t('Item not found.') . EOL);
return;
} }
} elseif (($a->argc == 3) && ($nick == 'feed-item')) { } elseif (($a->argc == 3) && ($nick == 'feed-item')) {
$r = dba::fetch_first("SELECT `id`, `parent`, `author-id`, `body`, `uid` $r = Item::selectFirstForUser(local_user(), $fields, ['id' => $a->argv[2], 'private' => false, 'uid' => 0]);
FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
AND NOT `private` AND `uid` = 0
AND `id` = ? LIMIT 1", $a->argv[2]);
} }
if (DBM::is_result($r)) { if (!DBM::is_result($r) || $r['deleted']) {
if (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) { $a->error = 404;
logger('Directly serving XML for id '.$r["id"], LOGGER_DEBUG); notice(L10n::t('Item not found.') . EOL);
displayShowFeed($r["id"], false); return;
} }
if ($r["id"] != $r["parent"]) { if (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
$r = dba::fetch_first("SELECT `id`, `author-id`, `body`, `uid` FROM `item` logger('Directly serving XML for id '.$r["id"], LOGGER_DEBUG);
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` displayShowFeed($r["id"], false);
AND `id` = ?", $r["parent"]); }
}
$profiledata = display_fetchauthor($a, $r); if ($r["id"] != $r["parent"]) {
$r = Item::selectFirstForUser(local_user(), $fields, ['id' => $r["parent"]]);
}
if (strstr(normalise_link($profiledata["url"]), normalise_link(System::baseUrl()))) { $profiledata = display_fetchauthor($a, $r);
$nickname = str_replace(normalise_link(System::baseUrl())."/profile/", "", normalise_link($profiledata["url"]));
if (($nickname != $a->user["nickname"])) { if (strstr(normalise_link($profiledata["url"]), normalise_link(System::baseUrl()))) {
$r = dba::fetch_first("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` $nickname = str_replace(normalise_link(System::baseUrl())."/profile/", "", normalise_link($profiledata["url"]));
INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1", if (($nickname != $a->user["nickname"])) {
$nickname $r = dba::fetch_first("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
); INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
if (DBM::is_result($r)) { WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
$profiledata = $r; $nickname
} );
$profiledata["network"] = NETWORK_DFRN; if (DBM::is_result($r)) {
} else { $profiledata = $r;
$profiledata = [];
} }
$profiledata["network"] = NETWORK_DFRN;
} else {
$profiledata = [];
} }
} }

17
mod/editpost.php
View File

@ -8,6 +8,7 @@ use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Model\Item;
use Friendica\Database\DBM; use Friendica\Database\DBM;
function editpost_content(App $a) { function editpost_content(App $a) {
@ -26,11 +27,9 @@ function editpost_content(App $a) {
return; return;
} }
$itm = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", $fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
intval($post_id), 'type', 'body', 'title', 'file'];
intval(local_user()) $itm = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
);
if (! DBM::is_result($itm)) { if (! DBM::is_result($itm)) {
notice(L10n::t('Item not found') . EOL); notice(L10n::t('Item not found') . EOL);
return; return;
@ -124,8 +123,8 @@ function editpost_content(App $a) {
'$shortnoloc' => L10n::t('clear location'), '$shortnoloc' => L10n::t('clear location'),
'$wait' => L10n::t('Please wait'), '$wait' => L10n::t('Please wait'),
'$permset' => L10n::t('Permission settings'), '$permset' => L10n::t('Permission settings'),
'$ptyp' => $itm[0]['type'], '$ptyp' => $itm['type'],
'$content' => undo_post_tagging($itm[0]['body']), '$content' => undo_post_tagging($itm['body']),
'$post_id' => $post_id, '$post_id' => $post_id,
'$baseurl' => System::baseUrl(), '$baseurl' => System::baseUrl(),
'$defloc' => $a->user['default-location'], '$defloc' => $a->user['default-location'],
@ -134,9 +133,9 @@ function editpost_content(App $a) {
'$emailcc' => L10n::t('CC: email addresses'), '$emailcc' => L10n::t('CC: email addresses'),
'$public' => L10n::t('Public post'), '$public' => L10n::t('Public post'),
'$jotnets' => $jotnets, '$jotnets' => $jotnets,
'$title' => htmlspecialchars($itm[0]['title']), '$title' => htmlspecialchars($itm['title']),
'$placeholdertitle' => L10n::t('Set title'), '$placeholdertitle' => L10n::t('Set title'),
'$category' => file_tag_file_to_list($itm[0]['file'], 'category'), '$category' => file_tag_file_to_list($itm['file'], 'category'),
'$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t("Categories \x28comma-separated list\x29") : ''), '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t("Categories \x28comma-separated list\x29") : ''),
'$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'), '$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'),
'$lockstate' => $lockstate, '$lockstate' => $lockstate,

42
mod/fetch.php
View File

@ -7,7 +7,10 @@ use Friendica\App;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
use Friendica\Model\Item;
use Friendica\Model\User;
use Friendica\Util\XML; use Friendica\Util\XML;
use Friendica\Database\DBM;
function fetch_init(App $a) function fetch_init(App $a)
{ {
@ -20,24 +23,14 @@ function fetch_init(App $a)
$guid = $a->argv[2]; $guid = $a->argv[2];
// Fetch the item // Fetch the item
$item = q( $fields = ['uid', 'title', 'body', 'guid', 'contact-id', 'private', 'created', 'app', 'location', 'coord', 'network'];
"SELECT `uid`, `title`, `body`, `guid`, `contact-id`, `private`, `created`, `app`, `location`, `coord` $condition = ['wall' => true, 'private' => false, 'guid' => $guid, 'network' => [NETWORK_DFRN, NETWORK_DIASPORA]];
FROM `item` WHERE `wall` AND NOT `private` AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1", $item = Item::selectFirst($fields, $condition);
dbesc($guid), if (!DBM::is_result($item)) {
NETWORK_DFRN, $condition = ['guid' => $guid, 'network' => [NETWORK_DFRN, NETWORK_DIASPORA]];
NETWORK_DIASPORA $item = Item::selectFirst(['author-link'], $condition);
); if (DBM::is_result($item)) {
if (!$item) { $parts = parse_url($item["author-link"]);
$r = q(
"SELECT `author-link`
FROM `item` WHERE `uid` = 0 AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
dbesc($guid),
NETWORK_DFRN,
NETWORK_DIASPORA
);
if ($r) {
$parts = parse_url($r[0]["author-link"]);
$host = $parts["scheme"]."://".$parts["host"]; $host = $parts["scheme"]."://".$parts["host"];
if (normalise_link($host) != normalise_link(System::baseUrl())) { if (normalise_link($host) != normalise_link(System::baseUrl())) {
@ -54,20 +47,13 @@ function fetch_init(App $a)
} }
// Fetch some data from the author (We could combine both queries - but I think this is more readable) // Fetch some data from the author (We could combine both queries - but I think this is more readable)
$r = q( $user = User::getOwnerDataById($item["uid"]);
"SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user` if (!$user) {
INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
WHERE `user`.`uid` = %d",
intval($item[0]["uid"])
);
if (!$r) {
header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found')); header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
killme(); killme();
} }
$user = $r[0];
$status = Diaspora::buildStatus($item[0], $user); $status = Diaspora::buildStatus($item, $user);
$xml = Diaspora::buildPostXml($status["type"], $status["message"]); $xml = Diaspora::buildPostXml($status["type"], $status["message"]);
// Send the envelope // Send the envelope

21
mod/photos.php
View File

@ -19,6 +19,7 @@ use Friendica\Model\Group;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Model\User;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Image; use Friendica\Object\Image;
use Friendica\Protocol\DFRN; use Friendica\Protocol\DFRN;
@ -175,19 +176,14 @@ function photos_post(App $a)
killme(); killme();
} }
$r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` $owner_record = User::getOwnerDataById($page_owner_uid);
WHERE `user`.`uid` = %d AND `self` = 1 LIMIT 1",
intval($page_owner_uid)
);
if (!DBM::is_result($r)) { if (!$owner_record) {
notice(L10n::t('Contact information unavailable') . EOL); notice(L10n::t('Contact information unavailable') . EOL);
logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid); logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
killme(); killme();
} }
$owner_record = $r[0];
if ($a->argc > 3 && $a->argv[2] === 'album') { if ($a->argc > 3 && $a->argv[2] === 'album') {
$album = hex2bin($a->argv[3]); $album = hex2bin($a->argv[3]);
@ -487,14 +483,11 @@ function photos_post(App $a)
} }
if ($item_id) { if ($item_id) {
$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", $item = Item::selectFirst(['tag', 'inform'], ['id' => $item_id, 'uid' => $page_owner_uid]);
intval($item_id),
intval($page_owner_uid)
);
} }
if (DBM::is_result($r)) { if (DBM::is_result($item)) {
$old_tag = $r[0]['tag']; $old_tag = $item['tag'];
$old_inform = $r[0]['inform']; $old_inform = $item['inform'];
} }
if (strlen($rawtags)) { if (strlen($rawtags)) {

43
mod/tagrm.php
View File

@ -10,29 +10,25 @@ use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Item; use Friendica\Model\Item;
function tagrm_post(App $a) { function tagrm_post(App $a)
{
if (!local_user()) { if (!local_user()) {
goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
} }
if ((x($_POST,'submit')) && ($_POST['submit'] === L10n::t('Cancel'))) { if (x($_POST,'submit') && ($_POST['submit'] === L10n::t('Cancel'))) {
goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
} }
$tag = ((x($_POST,'tag')) ? hex2bin(notags(trim($_POST['tag']))) : ''); $tag = (x($_POST,'tag') ? hex2bin(notags(trim($_POST['tag']))) : '');
$item = ((x($_POST,'item')) ? intval($_POST['item']) : 0 ); $item_id = (x($_POST,'item') ? intval($_POST['item']) : 0);
$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", $item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
intval($item), if (!DBM::is_result($item)) {
intval(local_user())
);
if (!DBM::is_result($r)) {
goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
} }
$arr = explode(',', $r[0]['tag']); $arr = explode(',', $item['tag']);
for ($x = 0; $x < count($arr); $x ++) { for ($x = 0; $x < count($arr); $x ++) {
if ($arr[$x] === $tag) { if ($arr[$x] === $tag) {
unset($arr[$x]); unset($arr[$x]);
@ -42,7 +38,7 @@ function tagrm_post(App $a) {
$tag_str = implode(',',$arr); $tag_str = implode(',',$arr);
Item::update(['tag' => $tag_str], ['id' => $item]); Item::update(['tag' => $tag_str], ['id' => $item_id]);
info(L10n::t('Tag removed') . EOL ); info(L10n::t('Tag removed') . EOL );
goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
@ -52,8 +48,8 @@ function tagrm_post(App $a) {
function tagrm_content(App $a) { function tagrm_content(App $a)
{
$o = ''; $o = '';
if (!local_user()) { if (!local_user()) {
@ -61,22 +57,18 @@ function tagrm_content(App $a) {
// NOTREACHED // NOTREACHED
} }
$item = (($a->argc > 1) ? intval($a->argv[1]) : 0); $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
if (!$item) { if (!$item_id) {
goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
// NOTREACHED // NOTREACHED
} }
$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", $item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
intval($item), if (!DBM::is_result($item)) {
intval(local_user())
);
if (!DBM::is_result($r)) {
goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
} }
$arr = explode(',', $r[0]['tag']); $arr = explode(',', $item['tag']);
if (!count($arr)) { if (!count($arr)) {
goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
@ -87,7 +79,7 @@ function tagrm_content(App $a) {
$o .= '<p id="tag-remove-desc">' . L10n::t('Select a tag to remove: ') . '</p>'; $o .= '<p id="tag-remove-desc">' . L10n::t('Select a tag to remove: ') . '</p>';
$o .= '<form id="tagrm" action="tagrm" method="post" >'; $o .= '<form id="tagrm" action="tagrm" method="post" >';
$o .= '<input type="hidden" name="item" value="' . $item . '" />'; $o .= '<input type="hidden" name="item" value="' . $item_id . '" />';
$o .= '<ul>'; $o .= '<ul>';
foreach ($arr as $x) { foreach ($arr as $x) {
@ -100,5 +92,4 @@ function tagrm_content(App $a) {
$o .= '</form>'; $o .= '</form>';
return $o; return $o;
} }

27
mod/viewsrc.php
View File

@ -5,10 +5,11 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Item;
function viewsrc_content(App $a) { function viewsrc_content(App $a)
{
if (! local_user()) { if (!local_user()) {
notice(L10n::t('Access denied.') . EOL); notice(L10n::t('Access denied.') . EOL);
return; return;
} }
@ -16,27 +17,21 @@ function viewsrc_content(App $a) {
$o = ''; $o = '';
$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
if(! $item_id) { if (!$item_id) {
$a->error = 404; $a->error = 404;
notice(L10n::t('Item not found.') . EOL); notice(L10n::t('Item not found.') . EOL);
return; return;
} }
$r = q("SELECT `item`.`body` FROM `item` $item = Item::selectFirst(['body'], ['uid' => local_user(), 'id' => $item_id]);
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
and `item`.`moderated` = 0
AND `item`.`id` = '%s' LIMIT 1",
intval(local_user()),
dbesc($item_id)
);
if (DBM::is_result($r)) if (DBM::is_result($item)) {
if(is_ajax()) { if (is_ajax()) {
echo str_replace("\n",'<br />',$r[0]['body']); echo str_replace("\n",'<br />',$item['body']);
killme(); killme();
} else { } else {
$o .= str_replace("\n",'<br />',$r[0]['body']); $o .= str_replace("\n",'<br />',$item['body']);
} }
}
return $o; return $o;
} }

16
src/Model/Item.php
View File

@ -38,8 +38,8 @@ class Item extends BaseObject
'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink', 'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'attach', 'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'attach',
'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object', 'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object',
'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'item_id', 'item_network', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'item_id',
'author-id', 'author-link', 'author-name', 'author-avatar', 'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network',
'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-id', 'owner-link', 'owner-name', 'owner-avatar',
'contact-id', 'contact-link', 'contact-name', 'contact-avatar', 'contact-id', 'contact-link', 'contact-name', 'contact-avatar',
'network', 'url', 'name', 'writable', 'self', 'cid', 'alias', 'network', 'url', 'name', 'writable', 'self', 'cid', 'alias',
@ -250,17 +250,19 @@ class Item extends BaseObject
'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'unseen', 'deleted', 'origin', 'forum_mode', 'mention',
'rendered-hash', 'rendered-html', 'global', 'shadow', 'content-warning', 'rendered-hash', 'rendered-html', 'global', 'shadow', 'content-warning',
'id' => 'item_id', 'network' => 'item_network']; 'id' => 'item_id', 'network'];
$fields['author'] = ['url' => 'author-link', 'name' => 'author-name', 'thumb' => 'author-avatar']; $fields['author'] = ['url' => 'author-link', 'name' => 'author-name',
'thumb' => 'author-avatar', 'nick' => 'author-nick', 'network' => 'author-network'];
$fields['owner'] = ['url' => 'owner-link', 'name' => 'owner-name', 'thumb' => 'owner-avatar']; $fields['owner'] = ['url' => 'owner-link', 'name' => 'owner-name',
'thumb' => 'owner-avatar', 'nick' => 'owner-nick', 'network' => 'owner-network'];
$fields['contact'] = ['url' => 'contact-link', 'name' => 'contact-name', 'thumb' => 'contact-avatar', $fields['contact'] = ['url' => 'contact-link', 'name' => 'contact-name', 'thumb' => 'contact-avatar',
'network', 'url', 'name', 'writable', 'self', 'id' => 'cid', 'alias', 'uid' => 'contact-uid', 'network', 'url', 'name', 'writable', 'self', 'id' => 'cid', 'alias', 'uid' => 'contact-uid',
'photo', 'name-date', 'uri-date', 'avatar-date', 'thumb', 'dfrn-id']; 'photo', 'name-date', 'uri-date', 'avatar-date', 'thumb', 'dfrn-id', 'network' => 'contact-network'];
$fields['parent-item'] = ['guid' => 'parent-guid']; $fields['parent-item'] = ['guid' => 'parent-guid', 'network' => 'parent-network'];
$fields['parent-item-author'] = ['url' => 'parent-author-link', 'name' => 'parent-author-name']; $fields['parent-item-author'] = ['url' => 'parent-author-link', 'name' => 'parent-author-name'];

15
src/Model/User.php
View File

@ -65,6 +65,21 @@ class User
return $r; return $r;
} }
/**
* @brief Get owner data by nick name
*
* @param int $nick
* @return boolean|array
*/
public static function getOwnerDataByNick($nick)
{
$user = dba::selectFirst('user', ['uid'], ['nickname' => $nick]);
if (!DBM::is_result($user)) {
return false;
}
return self::getOwnerDataById($user['uid']);
}
/** /**
* @brief Returns the default group for a given user and network * @brief Returns the default group for a given user and network
* *

10
src/Object/Post.php
View File

@ -326,17 +326,17 @@ class Post extends BaseObject
$owner_name_e = $this->getOwnerName(); $owner_name_e = $this->getOwnerName();
// Disable features that aren't available in several networks // Disable features that aren't available in several networks
if (!in_array($item["item_network"], [NETWORK_DFRN, NETWORK_DIASPORA]) && isset($buttons["dislike"])) { if (!in_array($item["network"], [NETWORK_DFRN, NETWORK_DIASPORA]) && isset($buttons["dislike"])) {
unset($buttons["dislike"]); unset($buttons["dislike"]);
$isevent = false; $isevent = false;
$tagger = ''; $tagger = '';
} }
if (($item["item_network"] == NETWORK_FEED) && isset($buttons["like"])) { if (($item["network"] == NETWORK_FEED) && isset($buttons["like"])) {
unset($buttons["like"]); unset($buttons["like"]);
} }
if (($item["item_network"] == NETWORK_MAIL) && isset($buttons["like"])) { if (($item["network"] == NETWORK_MAIL) && isset($buttons["like"])) {
unset($buttons["like"]); unset($buttons["like"]);
} }
@ -401,8 +401,8 @@ class Post extends BaseObject
'wait' => L10n::t('Please wait'), 'wait' => L10n::t('Please wait'),
'thread_level' => $thread_level, 'thread_level' => $thread_level,
'edited' => $edited, 'edited' => $edited,
'network' => $item["item_network"], 'network' => $item["network"],
'network_name' => ContactSelector::networkToName($item['item_network'], $profile_link), 'network_name' => ContactSelector::networkToName($item['network'], $profile_link),
'received' => $item['received'], 'received' => $item['received'],
'commented' => $item['commented'], 'commented' => $item['commented'],
'created_date' => $item['created'], 'created_date' => $item['created'],

97
src/Protocol/OStatus.php
View File

@ -15,6 +15,7 @@ use Friendica\Model\Contact;
use Friendica\Model\Conversation; use Friendica\Model\Conversation;
use Friendica\Model\GContact; use Friendica\Model\GContact;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\User;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Image; use Friendica\Object\Image;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
@ -1619,22 +1620,14 @@ class OStatus
$title = self::entryHeader($doc, $entry, $owner, $item, $toplevel); $title = self::entryHeader($doc, $entry, $owner, $item, $toplevel);
$r = q( $condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => false,
"SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' AND NOT `private` AND `network` IN ('%s', '%s', '%s') LIMIT 1", 'network' => [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]];
intval($owner["uid"]), $repeated_item = Item::selectFirst([], $condition);
dbesc($repeated_guid), if (!DBM::is_result($repeated_item)) {
dbesc(NETWORK_DFRN),
dbesc(NETWORK_DIASPORA),
dbesc(NETWORK_OSTATUS)
);
if (DBM::is_result($r)) {
$repeated_item = $r[0];
} else {
return false; return false;
} }
$contact = self::contactEntry($repeated_item['author-link'], $owner);
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); $contact = self::contactEntry($repeated_item['author-link'], $owner);
$title = $owner["nick"]." repeated a notice by ".$contact["nick"]; $title = $owner["nick"]." repeated a notice by ".$contact["nick"];
@ -1695,16 +1688,11 @@ class OStatus
$as_object = $doc->createElement("activity:object"); $as_object = $doc->createElement("activity:object");
$parent = q( $parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]);
"SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
dbesc($item["thr-parent"]),
intval($item["uid"])
);
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent[0])); XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent));
self::entryContent($doc, $as_object, $parent[0], $owner, "New entry"); self::entryContent($doc, $as_object, $parent, $owner, "New entry");
$entry->appendChild($as_object); $entry->appendChild($as_object);
@ -1952,22 +1940,19 @@ class OStatus
$mentioned = []; $mentioned = [];
if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) { if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
$parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"])); $parent = item::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item["parent"]]);
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
$thrparent = q( $thrparent = item::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $parent_item]);
"SELECT `guid`, `author-link`, `owner-link`, `plink` FROM `item` WHERE `uid` = %d AND `uri` = '%s'",
intval($owner["uid"]), if (DBM::is_result($thrparent)) {
dbesc($parent_item) $mentioned[$thrparent["author-link"]] = $thrparent["author-link"];
); $mentioned[$thrparent["owner-link"]] = $thrparent["owner-link"];
if ($thrparent) { $parent_plink = $thrparent["plink"];
$mentioned[$thrparent[0]["author-link"]] = $thrparent[0]["author-link"];
$mentioned[$thrparent[0]["owner-link"]] = $thrparent[0]["owner-link"];
$parent_plink = $thrparent[0]["plink"];
} else { } else {
$mentioned[$parent[0]["author-link"]] = $parent[0]["author-link"]; $mentioned[$parent["author-link"]] = $parent["author-link"];
$mentioned[$parent[0]["owner-link"]] = $parent[0]["owner-link"]; $mentioned[$parent["owner-link"]] = $parent["owner-link"];
$parent_plink = System::baseUrl()."/display/".$parent[0]["guid"]; $parent_plink = System::baseUrl()."/display/".$parent["guid"];
} }
$attributes = [ $attributes = [
@ -2130,13 +2115,8 @@ class OStatus
return $result['feed']; return $result['feed'];
} }
$owner = dba::fetch_first( $owner = User::getOwnerDataByNick($owner_nick);
"SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type` if (!$owner) {
FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE `contact`.`self` AND `user`.`nickname` = ? LIMIT 1",
$owner_nick
);
if (!DBM::is_result($owner)) {
return; return;
} }
@ -2147,37 +2127,28 @@ class OStatus
$check_date = DateTimeFormat::utc($last_update); $check_date = DateTimeFormat::utc($last_update);
$authorid = Contact::getIdForURL($owner["url"], 0, true); $authorid = Contact::getIdForURL($owner["url"], 0, true);
$sql_extra = ''; $condition = ["`uid` = ? AND `created` > ? AND NOT `deleted`
AND NOT `private` AND `visible` AND `wall` AND `parent-network` IN (?, ?)",
$owner["uid"], $check_date, NETWORK_OSTATUS, NETWORK_DFRN];
if ($filter === 'posts') { if ($filter === 'posts') {
$sql_extra .= ' AND `item`.`id` = `item`.`parent` '; $condition[0] .= " AND `id` = `parent`";
} }
if ($filter === 'comments') { if ($filter === 'comments') {
$sql_extra .= sprintf(" AND `item`.`object-type` = '%s' ", dbesc(ACTIVITY_OBJ_COMMENT)); $condition[0] .= " AND `object-type` = ? ";
$condition[] = ACTIVITY_OBJ_COMMENT;
} }
if ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY) { if ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY) {
$sql_extra .= sprintf(" AND `item`.`contact-id` = %d AND `item`.`author-id` = %d ", intval($owner["id"]), intval($authorid)); $condition[0] .= " AND `contact-id` = ? AND `author-id` = ?";
$condition[] = $owner["id"];
$condition[] = $authorid;
} }
$items = q( $params = ['order' => ['created' => true], 'limit' => $max_items];
"SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`) $ret = Item::select([], $condition, $params);
STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent` $items = dba::inArray($ret);
WHERE `item`.`uid` = %d
AND `item`.`created` > '%s'
AND NOT `item`.`deleted`
AND NOT `item`.`private`
AND `item`.`visible`
AND `item`.`wall`
AND `thread`.`network` IN ('%s', '%s')
$sql_extra
ORDER BY `item`.`created` DESC LIMIT %d",
intval($owner["uid"]),
dbesc($check_date),
dbesc(NETWORK_OSTATUS),
dbesc(NETWORK_DFRN),
intval($max_items)
);
$doc = new DOMDocument('1.0', 'utf-8'); $doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true; $doc->formatOutput = true;