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]);
}
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");
'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"],
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]';
+ }
}
}
/// @TODO move to top of file or somewhere better
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)
+ *
+ * @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_media_metadata_create($type)
+{
+ $a = \get_app();
+
+ if (api_user() === false) {
+ Logger::info('no user');
+ throw new ForbiddenException();
+ }
+
+ api_get_user($a);
+
+ $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 (empty($data['media_id']) || empty($data['alt_text'])) {
+ throw new BadRequestException("Missing post data values");
+ }
+
+ if (empty($data['alt_text']['text'])) {
+ throw new BadRequestException("No alt text.");
+ }
+
+ Logger::info('Updating metadata', ['media_id' => $data['media_id']]);
+
+ $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.");
+ }
+
+ DBA::update('photo', ['desc' => $data['alt_text']['text']], ['resource-id' => $photo['resource-id']]);
+}
+
+api_register_func('api/media/metadata/create', 'api_media_metadata_create', true, API_METHOD_POST);
+
/**
* @param string $type Return format (atom, rss, xml, json)
* @param int $item_id
function api_get_last_status($ownerId, $uid)
{
$condition = [
- 'owner-id' => $ownerId,
+ 'author-id'=> $ownerId,
'uid' => $uid,
'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT],
'private' => false
$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];
}
'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) {
$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),
$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' => ['created' => true]]);
+ $announce = Item::selectFirstForUser($item['uid'], $fields, $condition, ['order' => ['received' => true]]);
if (!DBA::isResult($announce)) {
return [];
}
$posted = $matches[1];
}
- $pre_body = trim(preg_replace("/(.*?)\[share.*?\]\s?.*?\s?\[\/share\]\s?/ism", "$1", $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(preg_replace("/(.*?)\[share.*?\]\s?(.*?)\s?\[\/share\]\s?/ism", "$2", $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;
// 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