if (!empty($info['auth']) && api_user() === false) {
api_login($a);
+ Logger::info(API_LOG_PREFIX . 'username {username}', ['module' => 'api', 'action' => 'call', 'username' => $a->user['username']]);
}
- Logger::info(API_LOG_PREFIX . 'username {username}', ['module' => 'api', 'action' => 'call', 'username' => $a->user['username']]);
Logger::debug(API_LOG_PREFIX . 'parameters', ['module' => 'api', 'action' => 'call', 'parameters' => $_REQUEST]);
$stamp = microtime(true);
$return = call_user_func($info['func'], $type);
$duration = floatval(microtime(true) - $stamp);
- Logger::info(API_LOG_PREFIX . 'username {username}', ['module' => 'api', 'action' => 'call', 'username' => $a->user['username'], 'duration' => round($duration, 2)]);
+ Logger::info(API_LOG_PREFIX . 'duration {duration}', ['module' => 'api', 'action' => 'call', 'duration' => round($duration, 2)]);
DI::profiler()->saveLog(DI::logger(), API_LOG_PREFIX . 'performance');
'notifications' => false,
'statusnet_profile_url' => $contact["url"],
'uid' => 0,
- 'cid' => Contact::getIdForURL($contact["url"], api_user(), true),
- 'pid' => Contact::getIdForURL($contact["url"], 0, true),
+ 'cid' => Contact::getIdForURL($contact["url"], api_user(), false),
+ 'pid' => Contact::getIdForURL($contact["url"], 0, false),
'self' => 0,
'network' => $contact["network"],
];
$countfollowers = 0;
$starred = 0;
- $pcontact_id = Contact::getIdForURL($uinfo[0]['url'], 0, true);
+ $pcontact_id = Contact::getIdForURL($uinfo[0]['url'], 0, false);
if (!empty($profile['about'])) {
$description = $profile['about'];
'statusnet_profile_url' => $uinfo[0]['url'],
'uid' => intval($uinfo[0]['uid']),
'cid' => intval($uinfo[0]['cid']),
- 'pid' => Contact::getIdForURL($uinfo[0]["url"], 0, true),
+ 'pid' => Contact::getIdForURL($uinfo[0]["url"], 0, false),
'self' => $uinfo[0]['self'],
'network' => $uinfo[0]['network'],
];
"image_type" => $media["type"],
"friendica_preview_url" => $media["preview"]];
- Logger::log("Media uploaded: " . print_r($returndata, true), Logger::DEBUG);
+ Logger::info('Media uploaded', ['return' => $returndata]);
return ["media" => $returndata];
}
$pos = strpos($item['body'], "[share");
$post = substr($item['body'], $pos);
} else {
- $post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']);
+ $post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']);
if (!empty($item['title'])) {
$post .= '[h3]' . $item['title'] . "[/h3]\n";
throw new ForbiddenException();
}
- Logger::log(
- "api_statuses_user_timeline: api_user: ". api_user() .
- "\nuser_info: ".print_r($user_info, true) .
- "\n_REQUEST: ".print_r($_REQUEST, true),
- Logger::DEBUG
- );
+ Logger::info('api_statuses_user_timeline', ['api_user' => api_user(), 'user_info' => $user_info, '_REQUEST' => $_REQUEST]);
$since_id = $_REQUEST['since_id'] ?? 0;
$max_id = $_REQUEST['max_id'] ?? 0;
throw new BadRequestException("no albumname specified");
}
// check if album is existing
- $r = q(
- "SELECT DISTINCT `resource-id` FROM `photo` WHERE `uid` = %d AND `album` = '%s'",
- intval(api_user()),
- DBA::escape($album)
- );
- if (!DBA::isResult($r)) {
+
+ $photos = DBA::selectToArray('photo', ['resource-id'], ['uid' => api_user(), 'album' => $album], ['group_by' => ['resource-id']]);
+ if (!DBA::isResult($photos)) {
throw new BadRequestException("album not available");
}
+ $resourceIds = array_column($photos, 'resource-id');
+
// 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
- foreach ($r as $rr) {
- $condition = ['uid' => local_user(), 'resource-id' => $rr['resource-id'], 'type' => 'photo'];
- $photo_item = Item::selectFirstForUser(local_user(), ['id'], $condition);
-
- if (!DBA::isResult($photo_item)) {
- throw new InternalServerErrorException("problem with deleting items occured");
- }
- Item::deleteForUser(['id' => $photo_item['id']], api_user());
- }
+ $condition = ['uid' => api_user(), 'resource-id' => $resourceIds, 'type' => 'photo'];
+ Item::deleteForUser($condition, api_user());
// now let's delete all photos from the album
$result = Photo::delete(['uid' => api_user(), 'album' => $album]);
// return success of deletion or error message
if ($result) {
- // retrieve the id of the parent element (the photo element)
- $condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo'];
- $photo_item = Item::selectFirstForUser(local_user(), ['id'], $condition);
-
- if (!DBA::isResult($photo_item)) {
- 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
// 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['id']], api_user());
+ $condition = ['uid' => api_user(), 'resource-id' => $photo_id, 'type' => 'photo'];
+ Item::deleteForUser($condition, api_user());
- $answer = ['result' => 'deleted', 'message' => 'photo with id `' . $photo_id . '` has been deleted from server.'];
- return api_format_data("photo_delete", $type, ['$result' => $answer]);
+ $result = ['result' => 'deleted', 'message' => 'photo with id `' . $photo_id . '` has been deleted from server.'];
+ return api_format_data("photo_delete", $type, ['$result' => $result]);
} else {
throw new InternalServerErrorException("unknown error on deleting photo from database table");
}
Logger::log("photo upload: new profile image upload ended", Logger::DEBUG);
}
- if (isset($r) && $r) {
+ if (!empty($r)) {
// create entry in 'item'-table on new uploads to enable users to comment/like/dislike the photo
if ($photo_id == null && $mediatype == "photo") {
post_photo_item($resource_id, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $filetype, $visibility);
}
// retrieve item element for getting activities (like, dislike etc.) related to photo
- $condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo'];
- $item = Item::selectFirstForUser(local_user(), ['id'], $condition);
+ $condition = ['uid' => api_user(), 'resource-id' => $photo_id, 'type' => 'photo'];
+ $item = Item::selectFirst(['id', 'uid', 'uri', 'parent', 'allow_cid', 'deny_cid', 'allow_gid', 'deny_gid'], $condition);
if (!DBA::isResult($item)) {
throw new NotFoundException('Photo-related item not found.');
}
// retrieve comments on photo
$condition = ["`parent` = ? AND `uid` = ? AND (`gravity` IN (?, ?) OR `type`='photo')",
- $item[0]['parent'], api_user(), GRAVITY_PARENT, GRAVITY_COMMENT];
+ $item['parent'], api_user(), GRAVITY_PARENT, GRAVITY_COMMENT];
$statuses = Item::selectForUser(api_user(), [], $condition);
$data['photo']['friendica_comments'] = $comments;
// include info if rights on photo and rights on item are mismatching
- $rights_mismatch = $data['photo']['allow_cid'] != $item[0]['allow_cid'] ||
- $data['photo']['deny_cid'] != $item[0]['deny_cid'] ||
- $data['photo']['allow_gid'] != $item[0]['allow_gid'] ||
- $data['photo']['deny_cid'] != $item[0]['deny_cid'];
+ $rights_mismatch = $data['photo']['allow_cid'] != $item['allow_cid'] ||
+ $data['photo']['deny_cid'] != $item['deny_cid'] ||
+ $data['photo']['allow_gid'] != $item['allow_gid'] ||
+ $data['photo']['deny_gid'] != $item['deny_gid'];
$data['photo']['rights_mismatch'] = $rights_mismatch;
return $data;
$reshared_item["share-pre-body"] = $reshared['comment'];
$reshared_item["body"] = $reshared['shared'];
- $reshared_item["author-id"] = Contact::getIdForURL($reshared['profile'], 0, true);
+ $reshared_item["author-id"] = Contact::getIdForURL($reshared['profile'], 0, false);
$reshared_item["author-name"] = $reshared['author'];
$reshared_item["author-link"] = $reshared['profile'];
$reshared_item["author-avatar"] = $reshared['avatar'];
projects / friendica.git / blobdiff