* @return bool|string
* Contact url or False if contact id is unknown
*/
-function api_unique_id_to_url($id)
+function api_unique_id_to_nurl($id)
{
- $r = dba::select('contact', array('url'), array('uid' => 0, 'id' => $id), array('limit' => 1));
+ $r = dba::select('contact', array('nurl'), array('uid' => 0, 'id' => $id), array('limit' => 1));
if (DBM::is_result($r)) {
- return $r["url"];
+ return $r["nurl"];
} else {
return false;
}
// Searching for contact id with uid = 0
if (!is_null($contact_id) && (intval($contact_id) != 0)) {
- $user = dbesc(api_unique_id_to_url($contact_id));
+ $user = dbesc(api_unique_id_to_nurl($contact_id));
if ($user == "") {
throw new BadRequestException("User not found.");
}
if (is_null($user) && x($_GET, 'user_id')) {
- $user = dbesc(api_unique_id_to_url($_GET['user_id']));
+ $user = dbesc(api_unique_id_to_nurl($_GET['user_id']));
if ($user == "") {
throw new BadRequestException("User not found.");
$argid = count($called_api);
list($user, $null) = explode(".", $a->argv[$argid]);
if (is_numeric($user)) {
- $user = dbesc(api_unique_id_to_url($user));
+ $user = dbesc(api_unique_id_to_nurl($user));
if ($user == "") {
return false;
'retweeted' => false,
'possibly_sensitive' => false,
'lang' => "",
- 'statusnet_html' => $converted["html"],
- 'statusnet_conversation_id' => $lastwall['parent'],
+ 'statusnet_html' => $converted["html"],
+ 'statusnet_conversation_id' => $lastwall['parent'],
+ 'external_url' => System::baseUrl() . "/display/" . $lastwall['guid'],
);
if (count($converted["attachments"]) > 0) {
$geo => null,
'favorited' => $lastwall['starred'] ? true : false,
'statusnet_html' => $converted["html"],
- 'statusnet_conversation_id' => $lastwall['parent'],
+ 'statusnet_conversation_id' => $lastwall['parent'],
+ 'external_url' => System::baseUrl() . "/display/" . $lastwall['guid'],
);
if (count($converted["attachments"]) > 0) {
/// @TODO move to top of file or somewhere better
api_register_func('api/users/search', 'api_users_search');
+/**
+ * Return user objects
+ *
+ * @see https://developer.twitter.com/en/docs/accounts-and-users/follow-search-get-users/api-reference/get-users-lookup
+ *
+ * @param string $type Return format: json or xml
+ *
+ * @return array|string
+ * @throws UnauthorizedException
+ * @throws NotFoundException
+ */
+function api_users_lookup($type)
+{
+ $users = array();
+
+ if (x($_REQUEST['user_id'])) {
+ foreach (explode(',', $_REQUEST['user_id']) as $id) {
+ if (!empty($id)) {
+ $users[] = api_get_user(get_app(), $id);
+ }
+ }
+ }
+
+ if (empty($users)) {
+ throw new NotFoundException;
+ }
+
+ return api_format_data("users", $type, array('users' => $users));
+}
+
+/// @TODO move to top of file or somewhere better
+api_register_func('api/users/lookup', 'api_users_lookup', true);
+
+/**
+ * Returns statuses that match a specified query.
+ *
+ * @see https://developer.twitter.com/en/docs/tweets/search/api-reference/get-search-tweets
+ *
+ * @param string $type Return format: json, xml, atom, rss
+ *
+ * @return array|string
+ * @throws UnauthorizedException
+ * @throws BadRequestException
+ */
+function api_search($type)
+{
+ $data = array();
+
+ if (!x($_REQUEST, 'q')) {
+ throw new BadRequestException("q parameter is required.");
+ }
+
+ if (x($_REQUEST, 'rpp')) {
+ $count = $_REQUEST['rpp'];
+ } elseif (x($_REQUEST, 'count')) {
+ $count = $_REQUEST['count'];
+ } else {
+ $count = 15;
+ }
+
+ $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
+ $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
+ $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0);
+
+ $start = $page * $count;
+
+ if ($max_id > 0) {
+ $sql_extra .= ' AND `item`.`id` <= ' . intval($max_id);
+ }
+
+ $r = dba::p(
+ "SELECT ".item_fieldlists()."
+ FROM `item` ".item_joins()."
+ WHERE ".item_condition()." AND (`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))
+ AND `item`.`body` LIKE CONCAT('%',?,'%')
+ $sql_extra
+ AND `item`.`id`>?
+ ORDER BY `item`.`id` DESC LIMIT ".intval($start)." ,".intval($count)." ",
+ api_user(),
+ $_REQUEST['q'],
+ $since_id
+ );
+
+ $data['status'] = api_format_items(dba::inArray($r), api_get_user(get_app()));
+
+ return api_format_data("statuses", $type, $data);
+}
+
+/// @TODO move to top of file or somewhere better
+api_register_func('api/search/tweets', 'api_search', true);
+api_register_func('api/search', 'api_search', true);
+
/**
*
* http://developer.twitter.com/doc/get/statuses/home_timeline
$start = $page * $count;
- if ($max_id > 0) {
- $sql_extra = 'AND `item`.`id` <= ' . intval($max_id);
+ if ($exclude_replies && !$conversation_id) {
+ if ($max_id > 0) {
+ $sql_extra = 'AND `thread`.`iid` <= ' . intval($max_id);
+ }
+
+ $r = dba::p("SELECT " . item_fieldlists() . "
+ FROM `thread`
+ STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
+ " . item_joins() . "
+ STRAIGHT_JOIN `user` ON `user`.`uid` = `thread`.`uid`
+ AND NOT `user`.`hidewall`
+ AND `verb` = ?
+ AND NOT `thread`.`private`
+ AND `thread`.`wall`
+ AND `thread`.`visible`
+ AND NOT `thread`.`deleted`
+ AND NOT `thread`.`moderated`
+ AND `thread`.`iid` > ?
+ $sql_extra
+ ORDER BY `thread`.`iid` DESC
+ LIMIT " . intval($start) . ", " . intval($count),
+ ACTIVITY_POST,
+ $since_id
+ );
+
+ $r = dba::inArray($r);
+ } else {
+ if ($max_id > 0) {
+ $sql_extra = 'AND `item`.`id` <= ' . intval($max_id);
+ }
+ if ($conversation_id > 0) {
+ $sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id);
+ }
+
+ $r = dba::p("SELECT " . item_fieldlists() . "
+ FROM `item`
+ " . item_joins() . "
+ STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
+ AND NOT `user`.`hidewall`
+ AND `verb` = ?
+ AND NOT `item`.`private`
+ AND `item`.`wall`
+ AND `item`.`visible`
+ AND NOT `item`.`deleted`
+ AND NOT `item`.`moderated`
+ AND `item`.`id` > ?
+ $sql_extra
+ ORDER BY `item`.`id` DESC
+ LIMIT " . intval($start) . ", " . intval($count),
+ ACTIVITY_POST,
+ $since_id
+ );
+
+ $r = dba::inArray($r);
}
- if ($exclude_replies > 0) {
- $sql_extra .= ' AND `item`.`parent` = `item`.`id`';
+
+ $ret = api_format_items($r, $user_info, false, $type);
+
+ $data = array('status' => $ret);
+ switch ($type) {
+ case "atom":
+ case "rss":
+ $data = api_rss_extra($a, $data, $user_info);
+ break;
}
- if ($conversation_id > 0) {
- $sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id);
+
+ return api_format_data("statuses", $type, $data);
+}
+
+/// @TODO move to top of file or somewhere better
+api_register_func('api/statuses/public_timeline', 'api_statuses_public_timeline', true);
+
+/**
+ * @brief Returns the list of public federated posts this node knows about
+ *
+ * @param string $type Return format: json, xml, atom, rss
+ * @return array|string
+ * @throws ForbiddenException
+ */
+function api_statuses_networkpublic_timeline($type)
+{
+ $a = get_app();
+
+ if (api_user() === false) {
+ throw new ForbiddenException();
}
- $r = q(
- "SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
- `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
- `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
- `contact`.`id` AS `cid`,
- `user`.`nickname`, `user`.`hidewall`
- FROM `item`
- STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
- AND (NOT `contact`.`blocked` OR `contact`.`pending`)
- STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
- AND NOT `user`.`hidewall`
- WHERE `verb` = '%s' AND `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
- AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
- AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
- AND NOT `item`.`private` AND `item`.`wall`
+ $user_info = api_get_user($a);
+
+ $since_id = x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0;
+ $max_id = x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0;
+
+ // pagination
+ $count = x($_REQUEST, 'count') ? $_REQUEST['count'] : 20;
+ $page = x($_REQUEST, 'page') ? $_REQUEST['page'] : 1;
+ if ($page < 1) {
+ $page = 1;
+ }
+ $start = ($page - 1) * $count;
+
+ $sql_extra = '';
+ if ($max_id > 0) {
+ $sql_extra = 'AND `thread`.`iid` <= ' . intval($max_id);
+ }
+
+ $r = dba::p("SELECT " . item_fieldlists() . "
+ FROM `thread`
+ STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
+ " . item_joins() . "
+ WHERE `thread`.`uid` = 0
+ AND `verb` = ?
+ AND NOT `thread`.`private`
+ AND `thread`.`visible`
+ AND NOT `thread`.`deleted`
+ AND NOT `thread`.`moderated`
+ AND `thread`.`iid` > ?
$sql_extra
- AND `item`.`id`>%d
- ORDER BY `item`.`id` DESC LIMIT %d, %d ",
- dbesc(ACTIVITY_POST),
- intval($since_id),
- intval($start),
- intval($count)
+ ORDER BY `thread`.`iid` DESC
+ LIMIT " . intval($start) . ", " . intval($count),
+ ACTIVITY_POST,
+ $since_id
);
+ $r = dba::inArray($r);
+
$ret = api_format_items($r, $user_info, false, $type);
$data = array('status' => $ret);
}
/// @TODO move to top of file or somewhere better
-api_register_func('api/statuses/public_timeline', 'api_statuses_public_timeline', true);
+api_register_func('api/statuses/networkpublic_timeline', 'api_statuses_networkpublic_timeline', true);
/**
* @TODO nothing to say?
api_register_func('api/statuses/mentions', 'api_statuses_mentions', true);
api_register_func('api/statuses/replies', 'api_statuses_mentions', true);
+/**
+ * @brief Returns a user's public timeline
+ *
+ * @param string $type Either "json" or "xml"
+ * @return string|array
+ * @throws ForbiddenException
+ */
function api_statuses_user_timeline($type)
{
$a = get_app();
}
$user_info = api_get_user($a);
- // get last network messages
logger(
"api_statuses_user_timeline: api_user: ". api_user() .
LOGGER_DEBUG
);
- // params
- $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
- $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0);
- if ($page < 0) {
- $page = 0;
- }
- $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
- //$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0);
- $exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0);
- $conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0);
+ $since_id = x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0;
+ $max_id = x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0;
+ $exclude_replies = x($_REQUEST, 'exclude_replies') ? 1 : 0;
+ $conversation_id = x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0;
- $start = $page * $count;
+ // pagination
+ $count = x($_REQUEST, 'count') ? $_REQUEST['count'] : 20;
+ $page = x($_REQUEST, 'page') ? $_REQUEST['page'] : 1;
+ if ($page < 1) {
+ $page = 1;
+ }
+ $start = ($page - 1) * $count;
$sql_extra = '';
if ($user_info['self'] == 1) {
if ($exclude_replies > 0) {
$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
}
+
if ($conversation_id > 0) {
$sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id);
}
+ if ($max_id > 0) {
+ $sql_extra .= ' AND `item`.`id` <= ' . intval($max_id);
+ }
+
$r = q(
"SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
AND `item`.`contact-id` = %d
AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
$sql_extra
- AND `item`.`id`>%d
+ AND `item`.`id` > %d
ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
intval(api_user()),
dbesc(ACTIVITY_POST),
'user' => $status_user ,
'friendica_owner' => $owner_user,
//'entities' => NULL,
- 'statusnet_html' => $converted["html"],
- 'statusnet_conversation_id' => $item['parent'],
+ 'statusnet_html' => $converted["html"],
+ 'statusnet_conversation_id' => $item['parent'],
+ 'external_url' => System::baseUrl() . "/display/" . $item['guid'],
'friendica_activities' => api_format_items_activities($item, $type),
);
$sql_extra = " AND false ";
}
+ if ($qtype == 'blocks') {
+ $sql_filter = 'AND `blocked` AND NOT `pending`';
+ } elseif ($qtype == 'incoming') {
+ $sql_filter = 'AND `pending`';
+ } else {
+ $sql_filter = 'AND (NOT `blocked` OR `pending`)';
+ }
+
$r = q(
"SELECT `nurl`
FROM `contact`
WHERE `uid` = %d
AND NOT `self`
- AND (NOT `blocked` OR `pending`)
+ $sql_filter
$sql_extra
ORDER BY `nick`
LIMIT %d, %d",
api_register_func('api/statuses/friends', 'api_statuses_friends', true);
api_register_func('api/statuses/followers', 'api_statuses_followers', true);
+/**
+ * Returns the list of blocked users
+ *
+ * @see https://developer.twitter.com/en/docs/accounts-and-users/mute-block-report-users/api-reference/get-blocks-list
+ *
+ * @param string $type Either "json" or "xml"
+ *
+ * @return boolean|string|array
+ * @throws UnauthorizedException
+ */
+function api_blocks_list($type)
+{
+ $data = api_statuses_f('blocks');
+ if ($data === false) {
+ return false;
+ }
+ return api_format_data("users", $type, $data);
+}
+
+/// @TODO move to top of file or somewhere better
+api_register_func('api/blocks/list', 'api_blocks_list', true);
+
+/**
+ * Returns the list of pending users IDs
+ *
+ * @see https://developer.twitter.com/en/docs/accounts-and-users/follow-search-get-users/api-reference/get-friendships-incoming
+ *
+ * @param string $type Either "json" or "xml"
+ *
+ * @return boolean|string|array
+ * @throws UnauthorizedException
+ */
+function api_friendships_incoming($type)
+{
+ $data = api_statuses_f('incoming');
+ if ($data === false) {
+ return false;
+ }
+
+ $ids = array();
+ foreach ($data['user'] as $user) {
+ $ids[] = $user['id'];
+ }
+
+ return api_format_data("ids", $type, array('id' => $ids));
+}
+
+/// @TODO move to top of file or somewhere better
+api_register_func('api/friendships/incoming', 'api_friendships_incoming', true);
+
function api_statusnet_config($type)
{
$a = get_app();
projects / friendica.git / blobdiff