From: Mikael Nordfeldth Date: Thu, 14 Jan 2016 19:24:01 +0000 (+0100) Subject: Accept media_ids parameter from Twitter API v1.1 clients X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e5019c3858c2be6286fc33d5ee77314bb110bc63;p=quix0rs-gnu-social.git Accept media_ids parameter from Twitter API v1.1 clients They upload the media first and then provide media IDs in a comma separated parameter (but we just split it to all whole integers). --- diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index 590ba1f06e..0dc6a72279 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -152,6 +152,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction var $in_reply_to_status_id = null; var $lat = null; var $lon = null; + var $media_ids = array(); // file_id in the keys /** * Take arguments for running @@ -167,6 +168,18 @@ class ApiStatusesUpdateAction extends ApiAuthAction $this->status = $this->trimmed('status'); $this->lat = $this->trimmed('lat'); $this->lon = $this->trimmed('long'); + $matches = array(); + common_debug(get_called_class().': media_ids=='._ve($this->trimmed('media_ids'))); + if (preg_match_all('/\d+/', $this->trimmed('media_ids'), $matches) !== false) { + foreach (array_unique($matches[0]) as $match) { + try { + $this->media_ids[$match] = true; // = File::getByID($match); + } catch (Exception $e) { + // Either $match was 0 (EmptyIdException) or File was not found (NoResultException) + // Do we abort and report to the client? + } + } + } $this->in_reply_to_status_id = intval($this->trimmed('in_reply_to_status_id')); @@ -244,6 +257,13 @@ class ApiStatusesUpdateAction extends ApiAuthAction } } + common_debug(get_called_class().': parsed media_ids=='._ve($this->media_ids)); + foreach(array_keys($this->media_ids) as $media_id) { + // FIXME: Validation on this... Worst case is that if someone sends bad media_ids then + // we'll fill the notice with non-working links, so no real harm, done, but let's fix. + $this->status .= ' ' . common_local_url('attachment', array('attachment' => $media_id)); + } + $upload = null; try { $upload = MediaFile::fromUpload('media', $this->scoped);