$contact = DBA::selectFirst('contact', [], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
if (DBA::isResult($contact)) {
- // If no nick where given, extract it from the address
- if (($contact['nick'] == "") || ($contact['name'] == $contact['nick'])) {
- $contact['nick'] = api_get_nick($contact["url"]);
- }
-
$ret = [
'id' => $contact["id"],
'id_str' => (string) $contact["id"],
$countfollowers = 0;
$starred = 0;
- // Add a nick if it isn't present there
- if (($uinfo[0]['nick'] == "") || ($uinfo[0]['name'] == $uinfo[0]['nick'])) {
- $uinfo[0]['nick'] = api_get_nick($uinfo[0]["url"]);
- }
-
$pcontact_id = Contact::getIdForURL($uinfo[0]['url'], 0, true);
if (!empty($profile['about'])) {
$userlist = [];
if (!empty($_GET['q'])) {
- $r = q("SELECT id FROM `contact` WHERE `uid` = 0 AND `name` = '%s'", DBA::escape($_GET["q"]));
-
- if (!DBA::isResult($r)) {
- $r = q("SELECT `id` FROM `contact` WHERE `uid` = 0 AND `nick` = '%s'", DBA::escape($_GET["q"]));
- }
+ $contacts = Contact::selectToArray(
+ ['id'],
+ [
+ '`uid` = 0 AND (`name` = ? OR `nick` = ? OR `url` = ? OR `addr` = ?)',
+ $_GET['q'],
+ $_GET['q'],
+ $_GET['q'],
+ $_GET['q'],
+ ]
+ );
- if (DBA::isResult($r)) {
+ if (DBA::isResult($contacts)) {
$k = 0;
- foreach ($r as $user) {
- $user_info = api_get_user($a, $user["id"]);
+ foreach ($contacts as $contact) {
+ $user_info = api_get_user($a, $contact['id']);
- if ($type == "xml") {
- $userlist[$k++.":user"] = $user_info;
+ if ($type == 'xml') {
+ $userlist[$k++ . ':user'] = $user_info;
} else {
$userlist[] = $user_info;
}
}
- $userlist = ["users" => $userlist];
+ $userlist = ['users' => $userlist];
} else {
- throw new BadRequestException("User ".$_GET["q"]." not found.");
+ throw new NotFoundException('User ' . $_GET['q'] . ' not found.');
}
} else {
- throw new BadRequestException("No user specified.");
+ throw new BadRequestException('No search term specified.');
}
- return api_format_data("users", $type, $userlist);
+ return api_format_data('users', $type, $userlist);
}
/// @TODO move to top of file or somewhere better
$a = \get_app();
$user_info = api_get_user($a);
- if (api_user() === false || $user_info === false) { throw new ForbiddenException(); }
+ if (api_user() === false || $user_info === false) {
+ throw new ForbiddenException();
+ }
if (empty($_REQUEST['q'])) {
throw new BadRequestException('q parameter is required.');
}
}
- $statuses = Item::selectForUser(api_user(), [], $condition, $params);
+ $statuses = [];
+
+ if (parse_url($searchTerm, PHP_URL_SCHEME) != '') {
+ $id = Item::fetchByLink($searchTerm, api_user());
+ if (!$id) {
+ // Public post
+ $id = Item::fetchByLink($searchTerm);
+ }
+
+ if (!empty($id)) {
+ $statuses = Item::select([], ['id' => $id]);
+ }
+ }
+
+ $statuses = $statuses ?: Item::selectForUser(api_user(), [], $condition, $params);
$data['status'] = api_format_items(Item::inArray($statuses), $user_info);
Logger::log('API: api_statuses_repeat: '.$id);
- $fields = ['body', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
+ $fields = ['body', 'title', 'attach', 'tag', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
$item = Item::selectFirst($fields, ['id' => $id, 'private' => false]);
if (DBA::isResult($item) && $item['body'] != "") {
} else {
$post = share_header($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']);
+ if (!empty($item['title'])) {
+ $post .= '[h3]' . $item['title'] . "[/h3]\n";
+ }
+
$post .= $item['body'];
$post .= "[/share]";
}
$_REQUEST['body'] = $post;
+ $_REQUEST['tag'] = $item['tag'];
+ $_REQUEST['attach'] = $item['attach'];
$_REQUEST['profile_uid'] = api_user();
$_REQUEST['api_source'] = true;
$start = max(0, ($page - 1) * $count);
- $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `item`.`id` > ? AND `author-id` != ?
- AND `item`.`parent` IN (SELECT `iid` FROM `thread` WHERE `thread`.`uid` = ? AND `thread`.`mention` AND NOT `thread`.`ignored`)",
+ $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `item`.`id` > ? AND `author-id` != ? AND `mention`
+ AND `item`.`parent` IN (SELECT `iid` FROM `thread` WHERE `thread`.`uid` = ? AND NOT `thread`.`ignored`)",
api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, $user_info['pid'], api_user()];
if ($max_id > 0) {
function api_convert_item($item)
{
$body = $item['body'];
+ $entities = api_get_entitities($statustext, $body);
+
+ // Add pictures to the attachment array and remove them from the body
$attachments = api_get_attachments($body);
// Workaround for ostatus messages where the title is identically to the body
$statushtml .= BBCode::convert($item['plink']);
}
- $entities = api_get_entitities($statustext, $body);
-
return [
"text" => $statustext,
"html" => $statushtml,
*/
function api_get_attachments(&$body)
{
- $text = $body;
- $text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $text);
- $text = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/ism", '[img]$1[/img]', $text);
+ $body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);
+ $body = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/ism", '[img]$1[/img]', $body);
$URLSearchString = "^\[\]";
- $ret = preg_match_all("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $text, $images);
-
- if (!$ret) {
+ if (!preg_match_all("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $body, $images)) {
return [];
}
+ // Remove all embedded pictures, since they are added as attachments
+ foreach ($images[0] as $orig) {
+ $body = str_replace($orig, '', $body);
+ }
+
$attachments = [];
foreach ($images[1] as $image) {
}
}
- if (strstr($_SERVER['HTTP_USER_AGENT'] ?? '', 'AndStatus')) {
- foreach ($images[0] as $orig) {
- $body = str_replace($orig, "", $body);
- }
- }
-
return $attachments;
}
$bbcode = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '#$2', $bbcode);
$bbcode = preg_replace("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", '[url=$1]$2[/url]', $bbcode);
- //$bbcode = preg_replace("/\[url\](.*?)\[\/url\]/ism",'[url=$1]$1[/url]',$bbcode);
$bbcode = preg_replace("/\[video\](.*?)\[\/video\]/ism", '[url=$1]$1[/url]', $bbcode);
$bbcode = preg_replace(
$bbcode = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $bbcode);
- //preg_match_all("/\[url\]([$URLSearchString]*)\[\/url\]/ism", $bbcode, $urls1);
preg_match_all("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $bbcode, $urls);
$ordered_urls = [];
foreach ($urls[1] as $id => $url) {
- //$start = strpos($text, $url, $offset);
$start = iconv_strpos($text, $url, 0, "UTF-8");
if (!($start === false)) {
$ordered_urls[$start] = ["url" => $url, "title" => $urls[2][$id]];
ksort($ordered_urls);
$offset = 0;
- //foreach ($urls[1] AS $id=>$url) {
+
foreach ($ordered_urls as $url) {
if ((substr($url["title"], 0, 7) != "http://") && (substr($url["title"], 0, 8) != "https://")
&& !strpos($url["title"], "http://") && !strpos($url["title"], "https://")
}
}
- //$start = strpos($text, $url, $offset);
$start = iconv_strpos($text, $url["url"], $offset, "UTF-8");
if (!($start === false)) {
$entities["urls"][] = ["url" => $url["url"],
$ordered_images[$start] = ['url' => $image, 'alt' => ''];
}
}
- //$entities["media"] = array();
+
$offset = 0;
foreach ($ordered_images as $image) {
'attendyes' => [],
'attendno' => [],
'attendmaybe' => [],
+ 'announce' => [],
];
- $condition = ['uid' => $item['uid'], 'thr-parent' => $item['uri']];
+ $condition = ['uid' => $item['uid'], 'thr-parent' => $item['uri'], 'gravity' => GRAVITY_ACTIVITY];
$ret = Item::selectForUser($item['uid'], ['author-id', 'verb'], $condition);
while ($parent_item = Item::fetch($ret)) {
case Activity::ATTENDMAYBE:
$activities['attendmaybe'][] = $user;
break;
+ case Activity::ANNOUNCE:
+ $activities['announce'][] = $user;
+ break;
default:
break;
}
}
if (!empty($quoted_item)) {
- $conv_quoted = api_convert_item($quoted_item);
- $quoted_status = $status;
+ if ($quoted_item['id'] != $item['id']) {
+ $quoted_status = api_format_item($quoted_item);
+ /// @todo Only remove the attachments that are also contained in the quotes status
+ unset($status['attachments']);
+ unset($status['entities']);
+ } else {
+ $conv_quoted = api_convert_item($quoted_item);
+ $quoted_status = $status;
+ unset($quoted_status['attachments']);
+ unset($quoted_status['entities']);
+ 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"] = [];
+ }
+ }
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 (!empty($retweeted_item)) {
*
* @param string $type Return type (atom, rss, xml, json)
*
+ * @param int $rel A contact relationship constant
* @return array|string|void
* @throws BadRequestException
* @throws ForbiddenException
* @throws UnauthorizedException
* @todo use api_format_data() to return data
*/
-function api_ff_ids($type)
+function api_ff_ids($type, int $rel)
{
if (!api_user()) {
throw new ForbiddenException();
$stringify_ids = $_REQUEST['stringify_ids'] ?? false;
- $r = q(
- "SELECT `pcontact`.`id` FROM `contact`
- INNER JOIN `contact` AS `pcontact` ON `contact`.`nurl` = `pcontact`.`nurl` AND `pcontact`.`uid` = 0
- WHERE `contact`.`uid` = %s AND NOT `contact`.`self`",
- intval(api_user())
+ $contacts = DBA::p("SELECT `pcontact`.`id`
+ FROM `contact`
+ INNER JOIN `contact` AS `pcontact`
+ ON `contact`.`nurl` = `pcontact`.`nurl`
+ AND `pcontact`.`uid` = 0
+ WHERE `contact`.`uid` = ?
+ AND NOT `contact`.`self`
+ AND `contact`.`rel` IN (?, ?)",
+ api_user(),
+ $rel,
+ Contact::FRIEND
);
- if (!DBA::isResult($r)) {
- return;
- }
$ids = [];
- foreach ($r as $rr) {
+ foreach (DBA::toArray($contacts) as $contact) {
if ($stringify_ids) {
- $ids[] = $rr['id'];
+ $ids[] = $contact['id'];
} else {
- $ids[] = intval($rr['id']);
+ $ids[] = intval($contact['id']);
}
}
- return api_format_data("ids", $type, ['id' => $ids]);
+ return api_format_data('ids', $type, ['id' => $ids]);
}
/**
* @return array|string
* @throws BadRequestException
* @throws ForbiddenException
+ * @throws ImagickException
+ * @throws InternalServerErrorException
+ * @throws UnauthorizedException
* @see https://developer.twitter.com/en/docs/accounts-and-users/follow-search-get-users/api-reference/get-friends-ids
*/
function api_friends_ids($type)
{
- return api_ff_ids($type);
+ return api_ff_ids($type, Contact::SHARING);
}
/**
* @return array|string
* @throws BadRequestException
* @throws ForbiddenException
+ * @throws ImagickException
+ * @throws InternalServerErrorException
+ * @throws UnauthorizedException
* @see https://developer.twitter.com/en/docs/accounts-and-users/follow-search-get-users/api-reference/get-followers-ids
*/
function api_followers_ids($type)
{
- return api_ff_ids($type);
+ return api_ff_ids($type, Contact::FOLLOWER);
}
/// @TODO move to top of file or somewhere better
// traditional DFRN
$contact = DBA::selectFirst('contact', [], ['uid' => api_user(), 'nurl' => $c_url]);
-
- if (!DBA::isResult($contact) || ($contact['network'] !== Protocol::DFRN)) {
+ if (!DBA::isResult($contact)) {
throw new BadRequestException("Unknown contact");
}
$cid = $contact['id'];
- $dfrn_id = $contact['issued-id'] ?? $contact['dfrn-id'];
+ $dfrn_id = $contact['issued-id'] ?: $contact['dfrn-id'];
+
+ if (($contact['network'] !== Protocol::DFRN) || empty($dfrn_id)) {
+ System::externalRedirect($url ?: $c_url);
+ }
if ($contact['duplex'] && $contact['issued-id']) {
$orig_id = $contact['issued-id'];
}
}
- /// @TODO "$1" should maybe mean '$1' ?
- $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
- /*
- * Skip if there is no shared message in there
- * we already checked this in diaspora::isReshare()
- * but better one more than one less...
- */
- if (($body == $attributes) || empty($attributes)) {
+ $reshared = Item::getShareArray($item);
+ if (empty($reshared)) {
return false;
}
- // build the fake reshared item
$reshared_item = $item;
- $author = "";
- preg_match("/author='(.*?)'/ism", $attributes, $matches);
- if (!empty($matches[1])) {
- $author = html_entity_decode($matches[1], ENT_QUOTES, 'UTF-8');
- }
-
- preg_match('/author="(.*?)"/ism', $attributes, $matches);
- if (!empty($matches[1])) {
- $author = $matches[1];
- }
-
- $profile = "";
- preg_match("/profile='(.*?)'/ism", $attributes, $matches);
- if (!empty($matches[1])) {
- $profile = $matches[1];
- }
-
- preg_match('/profile="(.*?)"/ism', $attributes, $matches);
- if (!empty($matches[1])) {
- $profile = $matches[1];
- }
-
- $avatar = "";
- preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
- if (!empty($matches[1])) {
- $avatar = $matches[1];
- }
-
- preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
- if (!empty($matches[1])) {
- $avatar = $matches[1];
- }
-
- $link = "";
- preg_match("/link='(.*?)'/ism", $attributes, $matches);
- if (!empty($matches[1])) {
- $link = $matches[1];
- }
-
- preg_match('/link="(.*?)"/ism', $attributes, $matches);
- if (!empty($matches[1])) {
- $link = $matches[1];
- }
-
- $posted = "";
- preg_match("/posted='(.*?)'/ism", $attributes, $matches);
- if (!empty($matches[1])) {
- $posted = $matches[1];
- }
-
- preg_match('/posted="(.*?)"/ism', $attributes, $matches);
- if (!empty($matches[1])) {
- $posted = $matches[1];
- }
-
- if (!preg_match("/(.*?)\[share.*?\]\s?(.*?)\s?\[\/share\]\s?(.*?)/ism", $body, $matches)) {
+ if (empty($reshared['shared']) || empty($reshared['profile']) || empty($reshared['author']) || empty($reshared['avatar']) || empty($reshared['posted'])) {
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;
+ if (!empty($reshared['comment'])) {
+ $item['body'] = $reshared['comment'];
}
- $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;
- $reshared_item["author-link"] = $profile;
- $reshared_item["author-avatar"] = $avatar;
- $reshared_item["plink"] = $link;
- $reshared_item["created"] = $posted;
- $reshared_item["edited"] = $posted;
-
- return $reshared_item;
-}
-
-/**
- *
- * @param string $profile
- *
- * @return string|false
- * @throws InternalServerErrorException
- * @todo remove trailing junk from profile url
- * @todo pump.io check has to check the website
- */
-function api_get_nick($profile)
-{
- $nick = "";
+ $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-name"] = $reshared['author'];
+ $reshared_item["author-link"] = $reshared['profile'];
+ $reshared_item["author-avatar"] = $reshared['avatar'];
+ $reshared_item["plink"] = $reshared['link'] ?? '';
+ $reshared_item["created"] = $reshared['posted'];
+ $reshared_item["edited"] = $reshared['posted'];
- $r = q(
- "SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
- DBA::escape(Strings::normaliseLink($profile))
- );
-
- if (DBA::isResult($r)) {
- $nick = $r[0]["nick"];
- }
-
- if (!$nick == "") {
- $r = q(
- "SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
- DBA::escape(Strings::normaliseLink($profile))
- );
-
- if (DBA::isResult($r)) {
- $nick = $r[0]["nick"];
- }
- }
-
- if (!$nick == "") {
- $friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2", $profile);
- if ($friendica != $profile) {
- $nick = $friendica;
- }
- }
-
- if (!$nick == "") {
- $diaspora = preg_replace("=https?://(.*)/u/(.*)=ism", "$2", $profile);
- if ($diaspora != $profile) {
- $nick = $diaspora;
- }
- }
-
- if (!$nick == "") {
- $twitter = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $profile);
- if ($twitter != $profile) {
- $nick = $twitter;
- }
+ // Try to fetch the original item
+ if (!empty($reshared['guid'])) {
+ $condition = ['guid' => $reshared['guid'], 'uid' => [0, $item['uid']]];
+ } elseif (!empty($reshared_item['plink']) && ($original_id = Item::searchByLink($reshared_item['plink']))) {
+ $condition = ['id' => $original_id];
+ } else {
+ $condition = [];
}
-
- if (!$nick == "") {
- $StatusnetHost = preg_replace("=https?://(.*)/user/(.*)=ism", "$1", $profile);
- if ($StatusnetHost != $profile) {
- $StatusnetUser = preg_replace("=https?://(.*)/user/(.*)=ism", "$2", $profile);
- if ($StatusnetUser != $profile) {
- $UserData = Network::fetchUrl("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser);
- $user = json_decode($UserData);
- if ($user) {
- $nick = $user->screen_name;
- }
- }
+ if (!empty($condition)) {
+ $original_item = Item::selectFirst([], $condition);
+ if (DBA::isResult($original_item)) {
+ $reshared_item = array_merge($reshared_item, $original_item);
}
}
- // To-Do: look at the page if its really a pumpio site
- //if (!$nick == "") {
- // $pumpio = preg_replace("=https?://(.*)/(.*)/=ism", "$2", $profile."/");
- // if ($pumpio != $profile)
- // $nick = $pumpio;
- // <div class="media" id="profile-block" data-profile-id="acct:kabniel@microca.st">
-
- //}
-
- if ($nick != "") {
- return $nick;
- }
-
- return false;
+ return $reshared_item;
}
/**
$parent = Item::selectFirst($fields, ['id' => $in_reply_to['status_id']]);
if (DBA::isResult($parent)) {
- if ($parent['author-nick'] == "") {
- $parent['author-nick'] = api_get_nick($parent['author-link']);
- }
-
$in_reply_to['screen_name'] = (($parent['author-nick']) ? $parent['author-nick'] : $parent['author-name']);
$in_reply_to['user_id'] = intval($parent['author-id']);
$in_reply_to['user_id_str'] = (string) intval($parent['author-id']);
projects / friendica.git / blobdiff