X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fapi.php;h=404ede4239ddc966dcef7db6938f38642020f2ec;hb=94954c810b3ee0f885029f9818b217e0817ad70b;hp=e986a5173490791e432b28ada142971c5fa4e4d1;hpb=f498068b0f80af1149f28d1061d3d0ce464ee71e;p=friendica.git
diff --git a/include/api.php b/include/api.php
index e986a51734..404ede4239 100644
--- a/include/api.php
+++ b/include/api.php
@@ -7,15 +7,16 @@
*/
use Friendica\App;
+use Friendica\BaseObject;
use Friendica\Content\ContactSelector;
use Friendica\Content\Feature;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
+use Friendica\App\Authentication;
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
-use Friendica\Core\NotificationsManager;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\Session;
@@ -26,6 +27,7 @@ use Friendica\Model\Contact;
use Friendica\Model\Group;
use Friendica\Model\Item;
use Friendica\Model\Mail;
+use Friendica\Model\Notify;
use Friendica\Model\Photo;
use Friendica\Model\Profile;
use Friendica\Model\User;
@@ -41,8 +43,10 @@ use Friendica\Network\HTTPException\NotImplementedException;
use Friendica\Network\HTTPException\TooManyRequestsException;
use Friendica\Network\HTTPException\UnauthorizedException;
use Friendica\Object\Image;
+use Friendica\Protocol\Activity;
use Friendica\Protocol\Diaspora;
use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Images;
use Friendica\Util\Network;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
@@ -250,7 +254,9 @@ function api_login(App $a)
throw new UnauthorizedException("This API requires login");
}
- Session::setAuthenticatedForUser($a, $record);
+ /** @var Authentication $authentication */
+ $authentication = BaseObject::getClass(Authentication::class);
+ $authentication->setForUser($a, $record);
$_SESSION["allow_api"] = true;
@@ -322,7 +328,7 @@ function api_call(App $a)
$stamp = microtime(true);
$return = call_user_func($info['func'], $type);
- $duration = (float) (microtime(true) - $stamp);
+ $duration = floatval(microtime(true) - $stamp);
Logger::info(API_LOG_PREFIX . 'username {username}', ['module' => 'api', 'action' => 'call', 'username' => $a->user['username'], 'duration' => round($duration, 2)]);
@@ -602,11 +608,6 @@ function api_get_user(App $a, $contact_id = null)
$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"],
@@ -665,11 +666,6 @@ function api_get_user(App $a, $contact_id = null)
$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'])) {
@@ -956,7 +952,7 @@ function api_account_verify_credentials($type)
// - Adding last status
if (!$skip_status) {
$item = api_get_last_status($user_info['pid'], $user_info['uid']);
- if ($item) {
+ if (!empty($item)) {
$user_info['status'] = api_format_item($item, $type);
}
}
@@ -1165,7 +1161,7 @@ function api_statuses_update($type)
api_user()
);
if (DBA::isResult($r)) {
- $phototypes = Image::supportedTypes();
+ $phototypes = Images::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'] . ']';
@@ -1315,7 +1311,7 @@ function api_status_show($type, $item_id)
$status_info = [];
$item = api_get_item(['id' => $item_id]);
- if ($item) {
+ if (!empty($item)) {
$status_info = api_format_item($item, $type);
}
@@ -1374,12 +1370,12 @@ function api_get_item(array $condition)
*/
function api_users_show($type)
{
- $a = \Friendica\BaseObject::getApp();
+ $a = BaseObject::getApp();
$user_info = api_get_user($a);
$item = api_get_last_status($user_info['pid'], $user_info['uid']);
- if ($item) {
+ if (!empty($item)) {
$user_info['status'] = api_format_item($item, $type);
}
@@ -1413,32 +1409,37 @@ function api_users_search($type)
$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
@@ -1499,7 +1500,9 @@ function api_search($type)
$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.');
@@ -1563,7 +1566,21 @@ function api_search($type)
}
}
- $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);
@@ -2016,7 +2033,7 @@ function api_statuses_repeat($type)
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'] != "") {
@@ -2026,10 +2043,16 @@ function api_statuses_repeat($type)
} 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;
@@ -2135,8 +2158,8 @@ function api_statuses_mentions($type)
$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) {
@@ -2474,6 +2497,9 @@ function api_format_messages($item, $recipient, $sender)
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
@@ -2495,7 +2521,7 @@ function api_convert_item($item)
$statustext = mb_substr($statustext, 0, 1000) . "... \n" . ($item['plink'] ?? '');
}
- $statushtml = BBCode::convert(api_clean_attachments($body), false);
+ $statushtml = BBCode::convert(BBCode::removeAttachment($body), false);
// Workaround for clients with limited HTML parser functionality
$search = ["
", "
", "", @@ -2530,8 +2556,6 @@ function api_convert_item($item) $statushtml .= BBCode::convert($item['plink']); } - $entities = api_get_entitities($statustext, $body); - return [ "text" => $statustext, "html" => $statushtml, @@ -2549,32 +2573,29 @@ function api_convert_item($item) */ function api_get_attachments(&$body) { - $text = $body; - $text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/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) { - $imagedata = Image::getInfoFromURL($image); + $imagedata = Images::getInfoFromURLCached($image); if ($imagedata) { $attachments[] = ["url" => $image, "mimetype" => $imagedata["mime"], "size" => $imagedata["size"]]; } } - if (strstr($_SERVER['HTTP_USER_AGENT'] ?? '', 'AndStatus')) { - foreach ($images[0] as $orig) { - $body = str_replace($orig, "", $body); - } - } - return $attachments; } @@ -2617,7 +2638,6 @@ function api_get_entitities(&$text, $bbcode) $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( @@ -2636,12 +2656,10 @@ function api_get_entitities(&$text, $bbcode) $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]]; @@ -2651,7 +2669,7 @@ function api_get_entitities(&$text, $bbcode) 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://") @@ -2666,7 +2684,6 @@ function api_get_entitities(&$text, $bbcode) } } - //$start = strpos($text, $url, $offset); $start = iconv_strpos($text, $url["url"], $offset, "UTF-8"); if (!($start === false)) { $entities["urls"][] = ["url" => $url["url"], @@ -2693,7 +2710,7 @@ function api_get_entitities(&$text, $bbcode) $ordered_images[$start] = ['url' => $image, 'alt' => '']; } } - //$entities["media"] = array(); + $offset = 0; foreach ($ordered_images as $image) { @@ -2709,7 +2726,7 @@ function api_get_entitities(&$text, $bbcode) $start = iconv_strpos($text, $url, $offset, "UTF-8"); if (!($start === false)) { - $image = Image::getInfoFromURL($url); + $image = Images::getInfoFromURLCached($url); if ($image) { // If image cache is activated, then use the following sizes: // thumb (150), small (340), medium (600) and large (1024) @@ -2717,19 +2734,19 @@ function api_get_entitities(&$text, $bbcode) $media_url = ProxyUtils::proxifyUrl($url); $sizes = []; - $scale = Image::getScalingDimensions($image[0], $image[1], 150); + $scale = Images::getScalingDimensions($image[0], $image[1], 150); $sizes["thumb"] = ["w" => $scale["width"], "h" => $scale["height"], "resize" => "fit"]; if (($image[0] > 150) || ($image[1] > 150)) { - $scale = Image::getScalingDimensions($image[0], $image[1], 340); + $scale = Images::getScalingDimensions($image[0], $image[1], 340); $sizes["small"] = ["w" => $scale["width"], "h" => $scale["height"], "resize" => "fit"]; } - $scale = Image::getScalingDimensions($image[0], $image[1], 600); + $scale = Images::getScalingDimensions($image[0], $image[1], 600); $sizes["medium"] = ["w" => $scale["width"], "h" => $scale["height"], "resize" => "fit"]; if (($image[0] > 600) || ($image[1] > 600)) { - $scale = Image::getScalingDimensions($image[0], $image[1], 1024); + $scale = Images::getScalingDimensions($image[0], $image[1], 1024); $sizes["large"] = ["w" => $scale["width"], "h" => $scale["height"], "resize" => "fit"]; } } else { @@ -2827,9 +2844,10 @@ function api_format_items_activities($item, $type = "json") '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)) { @@ -2839,21 +2857,24 @@ function api_format_items_activities($item, $type = "json") // get user data and add it to the array of the activity $user = api_get_user($a, $parent_item['author-id']); switch ($parent_item['verb']) { - case ACTIVITY_LIKE: + case Activity::LIKE: $activities['like'][] = $user; break; - case ACTIVITY_DISLIKE: + case Activity::DISLIKE: $activities['dislike'][] = $user; break; - case ACTIVITY_ATTEND: + case Activity::ATTEND: $activities['attendyes'][] = $user; break; - case ACTIVITY_ATTENDNO: + case Activity::ATTENDNO: $activities['attendno'][] = $user; break; - case ACTIVITY_ATTENDMAYBE: + case Activity::ATTENDMAYBE: $activities['attendmaybe'][] = $user; break; + case Activity::ANNOUNCE: + $activities['announce'][] = $user; + break; default: break; } @@ -2947,7 +2968,7 @@ function api_format_items_profiles($profile_row) */ function api_format_items($items, $user_info, $filter_user = false, $type = "json") { - $a = \Friendica\BaseObject::getApp(); + $a = BaseObject::getApp(); $ret = []; @@ -2981,7 +3002,7 @@ function api_format_items($items, $user_info, $filter_user = false, $type = "jso */ function api_format_item($item, $type = "json", $status_user = null, $author_user = null, $owner_user = null) { - $a = \Friendica\BaseObject::getApp(); + $a = 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); @@ -3062,22 +3083,31 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use } 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)) { @@ -3593,6 +3623,7 @@ api_register_func('api/statusnet/version', 'api_statusnet_version', false); * * @param string $type Return type (atom, rss, xml, json) * + * @param int $rel A contact relationship constant * @return array|string|void * @throws BadRequestException * @throws ForbiddenException @@ -3601,7 +3632,7 @@ api_register_func('api/statusnet/version', 'api_statusnet_version', false); * @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(); @@ -3613,26 +3644,29 @@ function api_ff_ids($type) $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]); } /** @@ -3643,11 +3677,14 @@ function api_ff_ids($type) * @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); } /** @@ -3658,11 +3695,14 @@ function api_friends_ids($type) * @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 @@ -4738,7 +4778,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $ } if ($filetype == "") { - $filetype=Image::guessType($filename); + $filetype = Images::guessType($filename); } $imagedata = @getimagesize($src); if ($imagedata) { @@ -4785,19 +4825,19 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $ $height = $Image->getHeight(); // create a new resource-id if not already provided - $hash = ($photo_id == null) ? Photo::newResource() : $photo_id; + $resource_id = ($photo_id == null) ? Photo::newResource() : $photo_id; if ($mediatype == "photo") { // upload normal image (scales 0, 1, 2) Logger::log("photo upload: starting new photo upload", Logger::DEBUG); - $r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 0, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); + $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 0, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); if (!$r) { Logger::log("photo upload: image upload with scale 0 (original size) failed"); } if ($width > 640 || $height > 640) { $Image->scaleDown(640); - $r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 1, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); + $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 1, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); if (!$r) { Logger::log("photo upload: image upload with scale 1 (640x640) failed"); } @@ -4805,7 +4845,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $ if ($width > 320 || $height > 320) { $Image->scaleDown(320); - $r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 2, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); + $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 2, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); if (!$r) { Logger::log("photo upload: image upload with scale 2 (320x320) failed"); } @@ -4817,7 +4857,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $ if ($width > 300 || $height > 300) { $Image->scaleDown(300); - $r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 4, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); + $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 4, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); if (!$r) { Logger::log("photo upload: profile image upload with scale 4 (300x300) failed"); } @@ -4825,7 +4865,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $ if ($width > 80 || $height > 80) { $Image->scaleDown(80); - $r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 5, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); + $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 5, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); if (!$r) { Logger::log("photo upload: profile image upload with scale 5 (80x80) failed"); } @@ -4833,7 +4873,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $ if ($width > 48 || $height > 48) { $Image->scaleDown(48); - $r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 6, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); + $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 6, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); if (!$r) { Logger::log("photo upload: profile image upload with scale 6 (48x48) failed"); } @@ -4845,10 +4885,10 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $ if (isset($r) && $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($hash, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $filetype, $visibility); + post_photo_item($resource_id, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $filetype, $visibility); } // on success return image data in json/xml format (like /api/friendica/photo does when no scale is given) - return prepare_photo_data($type, false, $hash); + return prepare_photo_data($type, false, $resource_id); } else { throw new InternalServerErrorException("image upload failed"); } @@ -5051,14 +5091,17 @@ function api_friendica_remoteauth() // 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']; @@ -5110,7 +5153,7 @@ function api_get_announce($item) } $fields = ['author-id', 'author-name', 'author-link', 'author-avatar']; - $activity = Item::activityToIndex(ACTIVITY2_ANNOUNCE); + $activity = Item::activityToIndex(Activity::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)) { @@ -5146,186 +5189,48 @@ function api_share_as_retweet(&$item) } } - /// @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; - } - - $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 = ""; - - $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 (!empty($reshared['comment'])) { + $item['body'] = $reshared['comment']; } - 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"]; - } - } + $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']; - 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; - //