use Friendica\Content\Feature;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
-use Friendica\Core\Authentication;
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\NotificationsManager;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
+use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Model\Item;
use Friendica\Model\Mail;
use Friendica\Model\Photo;
+use Friendica\Model\Profile;
use Friendica\Model\User;
use Friendica\Network\FKOAuth1;
use Friendica\Network\HTTPException;
use Friendica\Util\Strings;
use Friendica\Util\XML;
-require_once 'mod/share.php';
-require_once 'mod/item.php';
-require_once 'mod/wall_upload.php';
+require_once __DIR__ . '/../mod/share.php';
+require_once __DIR__ . '/../mod/item.php';
+require_once __DIR__ . '/../mod/wall_upload.php';
define('API_METHOD_ANY', '*');
define('API_METHOD_GET', 'GET');
if ($addon_auth['authenticated'] && count($addon_auth['user_record'])) {
$record = $addon_auth['user_record'];
} else {
- $user_id = User::authenticate(trim($user), trim($password));
+ $user_id = User::authenticate(trim($user), trim($password), true);
if ($user_id !== false) {
$record = DBA::selectFirst('user', [], ['uid' => $user_id]);
}
throw new UnauthorizedException("This API requires login");
}
- Authentication::setAuthenticatedSessionForUser($record);
+ Session::setAuthenticatedForUser($a, $record);
$_SESSION["allow_api"] = true;
break;
case "json":
header("Content-Type: application/json");
- $json = json_encode(end($return));
- if (!empty($_GET['callback'])) {
- $json = $_GET['callback'] . "(" . $json . ")";
+ if (!empty($return)) {
+ $json = json_encode(end($return));
+ if (!empty($_GET['callback'])) {
+ $json = $_GET['callback'] . "(" . $json . ")";
+ }
+ $return = $json;
}
- $return = $json;
break;
case "rss":
header("Content-Type: application/rss+xml");
}
}
- Logger::warning(API_LOG_PREFIX . 'not implemented', ['module' => 'api', 'action' => 'call']);
+ Logger::warning(API_LOG_PREFIX . 'not implemented', ['module' => 'api', 'action' => 'call', 'query' => $a->query_string]);
throw new NotImplementedException();
} catch (HTTPException $e) {
- header("HTTP/1.1 {$e->httpcode} {$e->httpdesc}");
+ header("HTTP/1.1 {$e->getCode()} {$e->httpdesc}");
return api_error($type, $e);
}
}
/// @TODO: https://dev.twitter.com/overview/api/response-codes
$error = ["error" => $error,
- "code" => $e->httpcode . " " . $e->httpdesc,
+ "code" => $e->getCode() . " " . $e->httpdesc,
"request" => $a->query_string];
$return = api_format_data('status', $type, ['status' => $error]);
'name' => $contact["name"],
'screen_name' => (($contact['nick']) ? $contact['nick'] : $contact['name']),
'location' => ($contact["location"] != "") ? $contact["location"] : ContactSelector::networkToName($contact['network'], $contact['url']),
- 'description' => $contact["about"],
+ 'description' => BBCode::toPlaintext($contact["about"]),
'profile_image_url' => $contact["micro"],
'profile_image_url_https' => $contact["micro"],
'profile_image_url_profile_size' => $contact["thumb"],
'name' => (($uinfo[0]['name']) ? $uinfo[0]['name'] : $uinfo[0]['nick']),
'screen_name' => (($uinfo[0]['nick']) ? $uinfo[0]['nick'] : $uinfo[0]['name']),
'location' => $location,
- 'description' => $description,
+ 'description' => BBCode::toPlaintext($description),
'profile_image_url' => $uinfo[0]['micro'],
'profile_image_url_https' => $uinfo[0]['micro'],
'profile_image_url_profile_size' => $uinfo[0]["thumb"],
{
$status_user = api_get_user($a, defaults($item, 'author-id', null));
+ $author_user = $status_user;
+
$status_user["protected"] = defaults($item, 'private', 0);
if (defaults($item, 'thr-parent', '') == defaults($item, 'uri', '')) {
$owner_user = api_get_user($a, defaults($item, 'owner-id', null));
} else {
- $owner_user = $status_user;
+ $owner_user = $author_user;
}
- return ([$status_user, $owner_user]);
+ return ([$status_user, $author_user, $owner_user]);
}
/**
*/
function api_account_verify_credentials($type)
{
-
$a = \get_app();
if (api_user() === false) {
// - Adding last status
if (!$skip_status) {
- $user_info["status"] = api_status_show("raw");
- if (isset($user_info["status"])) {
- if (!is_array($user_info["status"]) || !count($user_info["status"])) {
- unset($user_info["status"]);
- } else {
- unset($user_info["status"]["user"]);
- }
+ $item = api_get_last_status($user_info['pid'], $user_info['uid']);
+ if ($item) {
+ $user_info['status'] = api_format_item($item, $type);
}
}
if ($throttle_day > 0) {
$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60);
- $condition = ["`uid` = ? AND `wall` AND `created` > ?", api_user(), $datefrom];
+ $condition = ["`uid` = ? AND `wall` AND `received` > ?", api_user(), $datefrom];
$posts_day = DBA::count('thread', $condition);
if ($posts_day > $throttle_day) {
if ($throttle_week > 0) {
$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*7);
- $condition = ["`uid` = ? AND `wall` AND `created` > ?", api_user(), $datefrom];
+ $condition = ["`uid` = ? AND `wall` AND `received` > ?", api_user(), $datefrom];
$posts_week = DBA::count('thread', $condition);
if ($posts_week > $throttle_week) {
if ($throttle_month > 0) {
$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*30);
- $condition = ["`uid` = ? AND `wall` AND `created` > ?", api_user(), $datefrom];
+ $condition = ["`uid` = ? AND `wall` AND `received` > ?", api_user(), $datefrom];
$posts_month = DBA::count('thread', $condition);
if ($posts_month > $throttle_month) {
}
}
- // To-Do: Multiple IDs
if (requestdata('media_ids')) {
- $r = q(
- "SELECT `resource-id`, `scale`, `nickname`, `type` FROM `photo` INNER JOIN `user` ON `user`.`uid` = `photo`.`uid` WHERE `resource-id` IN (SELECT `resource-id` FROM `photo` WHERE `id` = %d) AND `scale` > 0 AND `photo`.`uid` = %d ORDER BY `photo`.`width` DESC LIMIT 1",
- intval(requestdata('media_ids')),
- api_user()
- );
- if (DBA::isResult($r)) {
- $phototypes = Image::supportedTypes();
- $ext = $phototypes[$r[0]['type']];
- $_REQUEST['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $r[0]['nickname'] . '/image/' . $r[0]['resource-id'] . ']';
- $_REQUEST['body'] .= '[img]' . System::baseUrl() . '/photo/' . $r[0]['resource-id'] . '-' . $r[0]['scale'] . '.' . $ext . '[/img][/url]';
+ $ids = explode(',', requestdata('media_ids'));
+ foreach ($ids as $id) {
+ $r = q(
+ "SELECT `resource-id`, `scale`, `nickname`, `type`, `desc` FROM `photo` INNER JOIN `user` ON `user`.`uid` = `photo`.`uid` WHERE `resource-id` IN (SELECT `resource-id` FROM `photo` WHERE `id` = %d) AND `scale` > 0 AND `photo`.`uid` = %d ORDER BY `photo`.`width` DESC LIMIT 1",
+ intval($id),
+ api_user()
+ );
+ if (DBA::isResult($r)) {
+ $phototypes = Image::supportedTypes();
+ $ext = $phototypes[$r[0]['type']];
+ $description = $r[0]['desc'] ?? '';
+ $_REQUEST['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $r[0]['nickname'] . '/image/' . $r[0]['resource-id'] . ']';
+ $_REQUEST['body'] .= '[img=' . System::baseUrl() . '/photo/' . $r[0]['resource-id'] . '-' . $r[0]['scale'] . '.' . $ext . ']' . $description . '[/img][/url]';
+ }
}
}
api_register_func('api/media/upload', 'api_media_upload', true, API_METHOD_POST);
/**
+ * Updates media meta data (picture descriptions)
*
* @param string $type Return type (atom, rss, xml, json)
*
- * @param int $item_id
* @return array|string
* @throws BadRequestException
+ * @throws ForbiddenException
* @throws ImagickException
* @throws InternalServerErrorException
+ * @throws TooManyRequestsException
* @throws UnauthorizedException
+ * @see https://developer.twitter.com/en/docs/tweets/post-and-engage/api-reference/post-statuses-update
+ *
+ * @todo Compare the corresponding Twitter function for correct return values
*/
-function api_status_show($type, $item_id = 0)
+function api_media_metadata_create($type)
{
$a = \get_app();
- $user_info = api_get_user($a);
+ if (api_user() === false) {
+ Logger::info('no user');
+ throw new ForbiddenException();
+ }
- Logger::log('api_status_show: user_info: '.print_r($user_info, true), Logger::DEBUG);
+ api_get_user($a);
- if (!empty($item_id)) {
- // Get the item with the given id
- $condition = ['id' => $item_id];
- } else {
- // get last public wall message
- $condition = ['owner-id' => $user_info['pid'], 'uid' => api_user(),
- 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]];
+ $postdata = Network::postdata();
+
+ if (empty($postdata)) {
+ throw new BadRequestException("No post data");
+ }
+
+ $data = json_decode($postdata, true);
+ if (empty($data)) {
+ throw new BadRequestException("Invalid post data");
}
- if ($type == "raw") {
- $condition['private'] = false;
+ if (empty($data['media_id']) || empty($data['alt_text'])) {
+ throw new BadRequestException("Missing post data values");
}
- $lastwall = Item::selectFirst(Item::ITEM_FIELDLIST, $condition, ['order' => ['id' => true]]);
+ if (empty($data['alt_text']['text'])) {
+ throw new BadRequestException("No alt text.");
+ }
- if (DBA::isResult($lastwall)) {
- $in_reply_to = api_in_reply_to($lastwall);
+ Logger::info('Updating metadata', ['media_id' => $data['media_id']]);
- $converted = api_convert_item($lastwall);
+ $condition = ['id' => $data['media_id'], 'uid' => api_user()];
+ $photo = DBA::selectFirst('photo', ['resource-id'], $condition);
+ if (!DBA::isResult($photo)) {
+ throw new BadRequestException("Metadata not found.");
+ }
- if ($type == "xml") {
- $geo = "georss:point";
- } else {
- $geo = "geo";
- }
-
- $status_info = [
- 'created_at' => api_date($lastwall['created']),
- 'id' => intval($lastwall['id']),
- 'id_str' => (string) $lastwall['id'],
- 'text' => $converted["text"],
- 'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
- 'truncated' => false,
- 'in_reply_to_status_id' => $in_reply_to['status_id'],
- 'in_reply_to_status_id_str' => $in_reply_to['status_id_str'],
- 'in_reply_to_user_id' => $in_reply_to['user_id'],
- 'in_reply_to_user_id_str' => $in_reply_to['user_id_str'],
- 'in_reply_to_screen_name' => $in_reply_to['screen_name'],
- 'user' => $user_info,
- $geo => null,
- 'coordinates' => '',
- 'place' => '',
- 'contributors' => '',
- 'is_quote_status' => false,
- 'retweet_count' => 0,
- 'favorite_count' => 0,
- 'favorited' => $lastwall['starred'] ? true : false,
- 'retweeted' => false,
- 'possibly_sensitive' => false,
- 'lang' => '',
- 'statusnet_html' => $converted["html"],
- 'statusnet_conversation_id' => $lastwall['parent'],
- 'external_url' => System::baseUrl() . '/display/' . $lastwall['guid'],
- ];
+ DBA::update('photo', ['desc' => $data['alt_text']['text']], ['resource-id' => $photo['resource-id']]);
+}
- if (count($converted["attachments"]) > 0) {
- $status_info["attachments"] = $converted["attachments"];
- }
+api_register_func('api/media/metadata/create', 'api_media_metadata_create', true, API_METHOD_POST);
- if (count($converted["entities"]) > 0) {
- $status_info["entities"] = $converted["entities"];
- }
+/**
+ * @param string $type Return format (atom, rss, xml, json)
+ * @param int $item_id
+ * @return string
+ * @throws Exception
+ */
+function api_status_show($type, $item_id)
+{
+ Logger::info(API_LOG_PREFIX . 'Start', ['action' => 'status_show', 'type' => $type, 'item_id' => $item_id]);
- if ($status_info["source"] == 'web') {
- $status_info["source"] = ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']);
- } elseif (ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']) != $status_info["source"]) {
- $status_info["source"] = trim($status_info["source"].' ('.ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']).')');
- }
+ $status_info = [];
- // "uid" and "self" are only needed for some internal stuff, so remove it from here
- unset($status_info["user"]["uid"]);
- unset($status_info["user"]["self"]);
+ $item = api_get_item(['id' => $item_id]);
+ if ($item) {
+ $status_info = api_format_item($item, $type);
+ }
- Logger::log('status_info: '.print_r($status_info, true), Logger::DEBUG);
+ Logger::info(API_LOG_PREFIX . 'End', ['action' => 'get_status', 'status_info' => $status_info]);
- if ($type == "raw") {
- return $status_info;
- }
+ return api_format_data('statuses', $type, ['status' => $status_info]);
+}
- return api_format_data("statuses", $type, ['status' => $status_info]);
- }
+/**
+ * Retrieves the last public status of the provided user info
+ *
+ * @param int $ownerId Public contact Id
+ * @param int $uid User Id
+ * @return array
+ * @throws Exception
+ */
+function api_get_last_status($ownerId, $uid)
+{
+ $condition = [
+ 'author-id'=> $ownerId,
+ 'uid' => $uid,
+ 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT],
+ 'private' => false
+ ];
+
+ $item = api_get_item($condition);
+
+ return $item;
+}
+
+/**
+ * Retrieves a single item record based on the provided condition and converts it for API use.
+ *
+ * @param array $condition Item table condition array
+ * @return array
+ * @throws Exception
+ */
+function api_get_item(array $condition)
+{
+ $item = Item::selectFirst(Item::DISPLAY_FIELDLIST, $condition, ['order' => ['id' => true]]);
+
+ return $item;
}
/**
*/
function api_users_show($type)
{
- $a = \get_app();
+ $a = \Friendica\BaseObject::getApp();
$user_info = api_get_user($a);
- $condition = ['owner-id' => $user_info['pid'], 'uid' => api_user(),
- 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'private' => false];
- $lastwall = Item::selectFirst(Item::ITEM_FIELDLIST, $condition, ['order' => ['id' => true]]);
-
- if (DBA::isResult($lastwall)) {
- $in_reply_to = api_in_reply_to($lastwall);
-
- $converted = api_convert_item($lastwall);
-
- if ($type == "xml") {
- $geo = "georss:point";
- } else {
- $geo = "geo";
- }
-
- $user_info['status'] = [
- 'text' => $converted["text"],
- 'truncated' => false,
- 'created_at' => api_date($lastwall['created']),
- 'in_reply_to_status_id' => $in_reply_to['status_id'],
- 'in_reply_to_status_id_str' => $in_reply_to['status_id_str'],
- 'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
- 'id' => intval($lastwall['contact-id']),
- 'id_str' => (string) $lastwall['contact-id'],
- 'in_reply_to_user_id' => $in_reply_to['user_id'],
- 'in_reply_to_user_id_str' => $in_reply_to['user_id_str'],
- 'in_reply_to_screen_name' => $in_reply_to['screen_name'],
- $geo => null,
- 'favorited' => $lastwall['starred'] ? true : false,
- 'statusnet_html' => $converted["html"],
- 'statusnet_conversation_id' => $lastwall['parent'],
- 'external_url' => System::baseUrl() . "/display/" . $lastwall['guid'],
- ];
-
- if (count($converted["attachments"]) > 0) {
- $user_info["status"]["attachments"] = $converted["attachments"];
- }
-
- if (count($converted["entities"]) > 0) {
- $user_info["status"]["entities"] = $converted["entities"];
- }
-
- if ($user_info["status"]["source"] == 'web') {
- $user_info["status"]["source"] = ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']);
- }
-
- if (ContactSelector::networkToName($lastwall['network'], $user_info['url']) != $user_info["status"]["source"]) {
- $user_info["status"]["source"] = trim($user_info["status"]["source"] . ' (' . ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']) . ')');
- }
+ $item = api_get_last_status($user_info['pid'], $user_info['uid']);
+ if ($item) {
+ $user_info['status'] = api_format_item($item, $type);
}
// "uid" and "self" are only needed for some internal stuff, so remove it from here
- unset($user_info["uid"]);
- unset($user_info["self"]);
+ unset($user_info['uid']);
+ unset($user_info['self']);
- return api_format_data("user", $type, ['user' => $user_info]);
+ return api_format_data('user', $type, ['user' => $user_info]);
}
/// @TODO move to top of file or somewhere better
Item::update(['unseen' => false], ['unseen' => true, 'id' => $idarray]);
}
}
-
+
bindComments($ret);
$data = ['status' => $ret];
$statustext = trim($statustitle."\n\n".$statusbody);
}
- if ((defaults($item, 'network', Protocol::PHANTOM) == Protocol::FEED) && (strlen($statustext)> 1000)) {
- $statustext = substr($statustext, 0, 1000) . "... \n" . defaults($item, 'plink', '');
+ if ((defaults($item, 'network', Protocol::PHANTOM) == Protocol::FEED) && (mb_strlen($statustext)> 1000)) {
+ $statustext = mb_substr($statustext, 0, 1000) . "... \n" . defaults($item, 'plink', '');
}
$statushtml = BBCode::convert(api_clean_attachments($body), false);
}
}
- preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images);
+ preg_match_all("/\[img\=(.*?)\](.*?)\[\/img\]/ism", $bbcode, $images, PREG_SET_ORDER);
$ordered_images = [];
+ foreach ($images as $image) {
+ $start = iconv_strpos($text, $image[1], 0, "UTF-8");
+ if (!($start === false)) {
+ $ordered_images[$start] = ['url' => $image[1], 'alt' => $image[2]];
+ }
+ }
+
+ preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images);
foreach ($images[1] as $image) {
- //$start = strpos($text, $url, $offset);
$start = iconv_strpos($text, $image, 0, "UTF-8");
if (!($start === false)) {
- $ordered_images[$start] = $image;
+ $ordered_images[$start] = ['url' => $image, 'alt' => ''];
}
}
//$entities["media"] = array();
$offset = 0;
- foreach ($ordered_images as $url) {
+ foreach ($ordered_images as $image) {
+ $url = $image['url'];
+ $ext_alt_text = $image['alt'];
+
$display_url = str_replace(["http://www.", "https://www."], ["", ""], $url);
$display_url = str_replace(["http://", "https://"], ["", ""], $display_url);
"url" => $url,
"display_url" => $display_url,
"expanded_url" => $url,
+ "ext_alt_text" => $ext_alt_text,
"type" => "photo",
"sizes" => $sizes];
}
/**
* @brief format items to be returned by api
*
- * @param array $r array of items
+ * @param array $items array of items
* @param array $user_info
* @param bool $filter_user filter items by $user_info
* @param string $type Return type (atom, rss, xml, json)
* @throws InternalServerErrorException
* @throws UnauthorizedException
*/
-function api_format_items($r, $user_info, $filter_user = false, $type = "json")
+function api_format_items($items, $user_info, $filter_user = false, $type = "json")
{
- $a = \get_app();
+ $a = \Friendica\BaseObject::getApp();
$ret = [];
- foreach ((array)$r as $item) {
- localize_item($item);
- list($status_user, $owner_user) = api_item_get_user($a, $item);
+ foreach ((array)$items as $item) {
+ list($status_user, $author_user, $owner_user) = api_item_get_user($a, $item);
// Look if the posts are matching if they should be filtered by user id
if ($filter_user && ($status_user["id"] != $user_info["id"])) {
continue;
}
- $in_reply_to = api_in_reply_to($item);
+ $status = api_format_item($item, $type, $status_user, $author_user, $owner_user);
- $converted = api_convert_item($item);
+ $ret[] = $status;
+ }
- if ($type == "xml") {
- $geo = "georss:point";
- } else {
- $geo = "geo";
- }
-
- $status = [
- 'text' => $converted["text"],
- 'truncated' => false,
- 'created_at'=> api_date($item['created']),
- 'in_reply_to_status_id' => $in_reply_to['status_id'],
- 'in_reply_to_status_id_str' => $in_reply_to['status_id_str'],
- 'source' => (($item['app']) ? $item['app'] : 'web'),
- 'id' => intval($item['id']),
- 'id_str' => (string) intval($item['id']),
- 'in_reply_to_user_id' => $in_reply_to['user_id'],
- 'in_reply_to_user_id_str' => $in_reply_to['user_id_str'],
- 'in_reply_to_screen_name' => $in_reply_to['screen_name'],
- $geo => null,
- 'favorited' => $item['starred'] ? true : false,
- 'user' => $status_user,
- 'friendica_owner' => $owner_user,
- 'friendica_private' => $item['private'] == 1,
- //'entities' => NULL,
- 'statusnet_html' => $converted["html"],
- 'statusnet_conversation_id' => $item['parent'],
- 'external_url' => System::baseUrl() . "/display/" . $item['guid'],
- 'friendica_activities' => api_format_items_activities($item, $type),
- ];
+ return $ret;
+}
+
+/**
+ * @param array $item Item record
+ * @param string $type Return format (atom, rss, xml, json)
+ * @param array $status_user User record of the item author, can be provided by api_item_get_user()
+ * @param array $author_user User record of the item author, can be provided by api_item_get_user()
+ * @param array $owner_user User record of the item owner, can be provided by api_item_get_user()
+ * @return array API-formatted status
+ * @throws BadRequestException
+ * @throws ImagickException
+ * @throws InternalServerErrorException
+ * @throws UnauthorizedException
+ */
+function api_format_item($item, $type = "json", $status_user = null, $author_user = null, $owner_user = null)
+{
+ $a = \Friendica\BaseObject::getApp();
+
+ if (empty($status_user) || empty($author_user) || empty($owner_user)) {
+ list($status_user, $author_user, $owner_user) = api_item_get_user($a, $item);
+ }
+
+ localize_item($item);
+
+ $in_reply_to = api_in_reply_to($item);
+
+ $converted = api_convert_item($item);
+
+ if ($type == "xml") {
+ $geo = "georss:point";
+ } else {
+ $geo = "geo";
+ }
+
+ $status = [
+ 'text' => $converted["text"],
+ 'truncated' => false,
+ 'created_at'=> api_date($item['created']),
+ 'in_reply_to_status_id' => $in_reply_to['status_id'],
+ 'in_reply_to_status_id_str' => $in_reply_to['status_id_str'],
+ 'source' => (($item['app']) ? $item['app'] : 'web'),
+ 'id' => intval($item['id']),
+ 'id_str' => (string) intval($item['id']),
+ 'in_reply_to_user_id' => $in_reply_to['user_id'],
+ 'in_reply_to_user_id_str' => $in_reply_to['user_id_str'],
+ 'in_reply_to_screen_name' => $in_reply_to['screen_name'],
+ $geo => null,
+ 'favorited' => $item['starred'] ? true : false,
+ 'user' => $status_user,
+ 'friendica_author' => $author_user,
+ 'friendica_owner' => $owner_user,
+ 'friendica_private' => $item['private'] == 1,
+ //'entities' => NULL,
+ 'statusnet_html' => $converted["html"],
+ 'statusnet_conversation_id' => $item['parent'],
+ 'external_url' => System::baseUrl() . "/display/" . $item['guid'],
+ 'friendica_activities' => api_format_items_activities($item, $type),
+ 'friendica_title' => $item['title'],
+ 'friendica_html' => BBCode::convert($item['body'], false)
+ ];
- if (count($converted["attachments"]) > 0) {
- $status["attachments"] = $converted["attachments"];
+ if (count($converted["attachments"]) > 0) {
+ $status["attachments"] = $converted["attachments"];
+ }
+
+ if (count($converted["entities"]) > 0) {
+ $status["entities"] = $converted["entities"];
+ }
+
+ if ($status["source"] == 'web') {
+ $status["source"] = ContactSelector::networkToName($item['network'], $item['author-link']);
+ } elseif (ContactSelector::networkToName($item['network'], $item['author-link']) != $status["source"]) {
+ $status["source"] = trim($status["source"].' ('.ContactSelector::networkToName($item['network'], $item['author-link']).')');
+ }
+
+ $retweeted_item = [];
+ $quoted_item = [];
+
+ if ($item["id"] == $item["parent"]) {
+ $body = $item['body'];
+ $retweeted_item = api_share_as_retweet($item);
+ if ($body != $item['body']) {
+ $quoted_item = $retweeted_item;
+ $retweeted_item = [];
}
+ }
- if (count($converted["entities"]) > 0) {
- $status["entities"] = $converted["entities"];
+ if (empty($retweeted_item) && ($item['owner-id'] == $item['author-id'])) {
+ $announce = api_get_announce($item);
+ if (!empty($announce)) {
+ $retweeted_item = $item;
+ $item = $announce;
+ $status['friendica_owner'] = api_get_user($a, $announce['author-id']);
}
+ }
- if ($status["source"] == 'web') {
- $status["source"] = ContactSelector::networkToName($item['network'], $item['author-link']);
- } elseif (ContactSelector::networkToName($item['network'], $item['author-link']) != $status["source"]) {
- $status["source"] = trim($status["source"].' ('.ContactSelector::networkToName($item['network'], $item['author-link']).')');
+ if (!empty($quoted_item)) {
+ $conv_quoted = api_convert_item($quoted_item);
+ $quoted_status = $status;
+ unset($quoted_status['friendica_author']);
+ unset($quoted_status['friendica_owner']);
+ unset($quoted_status['friendica_activities']);
+ unset($quoted_status['friendica_private']);
+ unset($quoted_status['statusnet_conversation_id']);
+ $quoted_status['text'] = $conv_quoted['text'];
+ $quoted_status['statusnet_html'] = $conv_quoted['html'];
+ try {
+ $quoted_status["user"] = api_get_user($a, $quoted_item["author-id"]);
+ } catch (BadRequestException $e) {
+ // user not found. should be found?
+ /// @todo check if the user should be always found
+ $quoted_status["user"] = [];
}
+ }
- if ($item["id"] == $item["parent"]) {
- $retweeted_item = api_share_as_retweet($item);
- if ($retweeted_item !== false) {
- $retweeted_status = $status;
- $status['user'] = $status['friendica_owner'];
- try {
- $retweeted_status["user"] = api_get_user($a, $retweeted_item["author-id"]);
- } catch (BadRequestException $e) {
- // user not found. should be found?
- /// @todo check if the user should be always found
- $retweeted_status["user"] = [];
- }
+ if (!empty($retweeted_item)) {
+ $retweeted_status = $status;
+ unset($retweeted_status['friendica_author']);
+ unset($retweeted_status['friendica_owner']);
+ unset($retweeted_status['friendica_activities']);
+ unset($retweeted_status['friendica_private']);
+ unset($retweeted_status['statusnet_conversation_id']);
+ $status['user'] = $status['friendica_owner'];
+ try {
+ $retweeted_status["user"] = api_get_user($a, $retweeted_item["author-id"]);
+ } catch (BadRequestException $e) {
+ // user not found. should be found?
+ /// @todo check if the user should be always found
+ $retweeted_status["user"] = [];
+ }
- $rt_converted = api_convert_item($retweeted_item);
+ $rt_converted = api_convert_item($retweeted_item);
- $retweeted_status['text'] = $rt_converted["text"];
- $retweeted_status['statusnet_html'] = $rt_converted["html"];
- $retweeted_status['friendica_activities'] = api_format_items_activities($retweeted_item, $type);
- $retweeted_status['created_at'] = api_date($retweeted_item['created']);
- $status['retweeted_status'] = $retweeted_status;
- }
+ $retweeted_status['text'] = $rt_converted["text"];
+ $retweeted_status['statusnet_html'] = $rt_converted["html"];
+ $retweeted_status['created_at'] = api_date($retweeted_item['created']);
+
+ if (!empty($quoted_status)) {
+ $retweeted_status['quoted_status'] = $quoted_status;
}
- // "uid" and "self" are only needed for some internal stuff, so remove it from here
- unset($status["user"]["uid"]);
- unset($status["user"]["self"]);
-
- if ($item["coord"] != "") {
- $coords = explode(' ', $item["coord"]);
- if (count($coords) == 2) {
- if ($type == "json") {
- $status["geo"] = ['type' => 'Point',
- 'coordinates' => [(float) $coords[0],
- (float) $coords[1]]];
- } else {// Not sure if this is the official format - if someone founds a documentation we can check
- $status["georss:point"] = $item["coord"];
- }
+ $status['friendica_author'] = $retweeted_status['user'];
+ $status['retweeted_status'] = $retweeted_status;
+ } elseif (!empty($quoted_status)) {
+ $root_status = api_convert_item($item);
+
+ $status['text'] = $root_status["text"];
+ $status['statusnet_html'] = $root_status["html"];
+ $status['quoted_status'] = $quoted_status;
+ }
+
+ // "uid" and "self" are only needed for some internal stuff, so remove it from here
+ unset($status["user"]["uid"]);
+ unset($status["user"]["self"]);
+
+ if ($item["coord"] != "") {
+ $coords = explode(' ', $item["coord"]);
+ if (count($coords) == 2) {
+ if ($type == "json") {
+ $status["geo"] = ['type' => 'Point',
+ 'coordinates' => [(float) $coords[0],
+ (float) $coords[1]]];
+ } else {// Not sure if this is the official format - if someone founds a documentation we can check
+ $status["georss:point"] = $item["coord"];
}
}
- $ret[] = $status;
- };
- return $ret;
+ }
+
+ return $status;
}
/**
$r = q(
"SELECT `resource-id`, MAX(scale) AS `scale`, `album`, `filename`, `type`, MAX(`created`) AS `created`,
MAX(`edited`) AS `edited`, MAX(`desc`) AS `desc` FROM `photo`
- WHERE `uid` = %d AND `album` != 'Contact Photos' GROUP BY `resource-id`",
+ WHERE `uid` = %d AND `album` != 'Contact Photos' GROUP BY `resource-id`, `album`, `filename`, `type`",
intval(local_user())
);
$typetoext = [
"SELECT %s `resource-id`, `created`, `edited`, `title`, `desc`, `album`, `filename`,
`type`, `height`, `width`, `datasize`, `profile`, `allow_cid`, `deny_cid`, `allow_gid`, `deny_gid`,
MIN(`scale`) AS `minscale`, MAX(`scale`) AS `maxscale`
- FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' %s GROUP BY `resource-id`",
+ FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' %s GROUP BY
+ `resource-id`, `created`, `edited`, `title`, `desc`, `album`, `filename`,
+ `type`, `height`, `width`, `datasize`, `profile`, `allow_cid`, `deny_cid`, `allow_gid`, `deny_gid`",
$data_sql,
intval(local_user()),
DBA::escape($photo_id),
}
api_register_func('api/friendica/remoteauth', 'api_friendica_remoteauth', true);
+/**
+ * Return an item with announcer data if it had been announced
+ *
+ * @param array $item Item array
+ * @return array Item array with announce data
+ */
+function api_get_announce($item)
+{
+ // Quit if the item already has got a different owner and author
+ if ($item['owner-id'] != $item['author-id']) {
+ return [];
+ }
+
+ // Don't change original or Diaspora posts
+ if ($item['origin'] || in_array($item['network'], [Protocol::DIASPORA])) {
+ return [];
+ }
+
+ // Quit if we do now the original author and it had been a post from a native network
+ if (!empty($item['contact-uid']) && in_array($item['network'], Protocol::NATIVE_SUPPORT)) {
+ return [];
+ }
+
+ $fields = ['author-id', 'author-name', 'author-link', 'author-avatar'];
+ $activity = Item::activityToIndex(ACTIVITY2_ANNOUNCE);
+ $condition = ['parent-uri' => $item['uri'], 'gravity' => GRAVITY_ACTIVITY, 'uid' => [0, $item['uid']], 'activity' => $activity];
+ $announce = Item::selectFirstForUser($item['uid'], $fields, $condition, ['order' => ['received' => true]]);
+ if (!DBA::isResult($announce)) {
+ return [];
+ }
+
+ return array_merge($item, $announce);
+}
+
/**
* @brief Return the item shared, if the item contains only the [share] tag
*
$posted = $matches[1];
}
- $shared_body = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$2", $body);
+ if (!preg_match("/(.*?)\[share.*?\]\s?(.*?)\s?\[\/share\]\s?(.*?)/ism", $body, $matches)) {
+ return false;
+ }
+
+ $pre_body = trim($matches[1]);
+ if ($pre_body != '') {
+ $item['body'] = $pre_body;
+ }
+
+ $shared_body = trim($matches[2]);
if (($shared_body == "") || ($profile == "") || ($author == "") || ($avatar == "") || ($posted == "")) {
return false;
}
+ $reshared_item["share-pre-body"] = $pre_body;
$reshared_item["body"] = $shared_body;
$reshared_item["author-id"] = Contact::getIdForURL($profile, 0, true);
$reshared_item["author-name"] = $author;
}
$nm = new NotificationsManager();
- $notes = $nm->getAll([], "+seen -date", 50);
+ $notes = $nm->getAll([], ['seen' => 'ASC', 'date' => 'DESC'], 50);
if ($type == "xml") {
$xmlnotes = [];
// get data of the specified profile id or all profiles of the user if not specified
if ($profile_id != 0) {
- $r = q(
- "SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d",
- intval(api_user()),
- intval($profile_id)
- );
-
+ $r = Profile::getById(api_user(), $profile_id);
// error message if specified gid is not in database
if (!DBA::isResult($r)) {
throw new BadRequestException("profile_id not available");
}
} else {
- $r = q(
- "SELECT * FROM `profile` WHERE `uid` = %d",
- intval(api_user())
- );
+ $r = Profile::getListByUser(api_user());
}
// loop through all returned profiles and retrieve data and users
$k = 0;
$profiles = [];
- foreach ($r as $rr) {
- $profile = api_format_items_profiles($rr);
-
- // select all users from contact table, loop and prepare standard return for user data
- $users = [];
- $nurls = q(
- "SELECT `id`, `nurl` FROM `contact` WHERE `uid`= %d AND `profile-id` = %d",
- intval(api_user()),
- intval($rr['id'])
- );
-
- foreach ($nurls as $nurl) {
- $user = api_get_user($a, $nurl['nurl']);
- ($type == "xml") ? $users[$k++ . ":user"] = $user : $users[] = $user;
- }
- $profile['users'] = $users;
+ if (DBA::isResult($r)) {
+ foreach ($r as $rr) {
+ $profile = api_format_items_profiles($rr);
+
+ // select all users from contact table, loop and prepare standard return for user data
+ $users = [];
+ $nurls = Contact::selectToArray(['id', 'nurl'], ['uid' => api_user(), 'profile-id' => $rr['id']]);
+ foreach ($nurls as $nurl) {
+ $user = api_get_user($a, $nurl['nurl']);
+ ($type == "xml") ? $users[$k++ . ":user"] = $user : $users[] = $user;
+ }
+ $profile['users'] = $users;
- // add prepared profile data to array for final return
- if ($type == "xml") {
- $profiles[$k++ . ":profile"] = $profile;
- } else {
- $profiles[] = $profile;
+ // add prepared profile data to array for final return
+ if ($type == "xml") {
+ $profiles[$k++ . ":profile"] = $profile;
+ } else {
+ $profiles[] = $profile;
+ }
}
}
$terms = DBA::select('search', ['id', 'term'], ['uid' => local_user()]);
$result = [];
- while ($term = $terms->fetch()) {
+ while ($term = DBA::fetch($terms)) {
$result[] = [
'created_at' => api_date(time()),
'id' => intval($term['id']),
projects / friendica.git / blobdiff