diff options
| -rw-r--r-- | _darcs/inventory | 4 | ||||
| -rw-r--r-- | _darcs/patches/20081230205939-84dde-4b6096859c6b44169dd3d809442fab15337061b2.gz | bin | 0 -> 403 bytes | |||
| -rw-r--r-- | _darcs/pristine/actions/twitapilaconica.php | 15 | ||||
| -rw-r--r-- | _darcs/tentative_pristine | 23 | ||||
| -rw-r--r-- | actions/twitapilaconica.php | 15 |
5 files changed, 48 insertions, 9 deletions
diff --git a/_darcs/inventory b/_darcs/inventory index 172053797..4a5f9fd97 100644 --- a/_darcs/inventory +++ b/_darcs/inventory @@ -102,4 +102,6 @@ Evan Prodromou <evan@prodromou.name>**20081230202019] [add laconica-specific methods to htaccess.sample Evan Prodromou <evan@prodromou.name>**20081230202513] [add laconica methods to unauthed ones -Evan Prodromou <evan@prodromou.name>**20081230203747]
\ No newline at end of file +Evan Prodromou <evan@prodromou.name>**20081230203747] +[implement api/laconica/version method +Evan Prodromou <evan@prodromou.name>**20081230205939]
\ No newline at end of file diff --git a/_darcs/patches/20081230205939-84dde-4b6096859c6b44169dd3d809442fab15337061b2.gz b/_darcs/patches/20081230205939-84dde-4b6096859c6b44169dd3d809442fab15337061b2.gz Binary files differnew file mode 100644 index 000000000..b44138c6c --- /dev/null +++ b/_darcs/patches/20081230205939-84dde-4b6096859c6b44169dd3d809442fab15337061b2.gz diff --git a/_darcs/pristine/actions/twitapilaconica.php b/_darcs/pristine/actions/twitapilaconica.php index 092f9e7d1..4ecbf94e1 100644 --- a/_darcs/pristine/actions/twitapilaconica.php +++ b/_darcs/pristine/actions/twitapilaconica.php @@ -53,6 +53,8 @@ class TwitapilaconicaAction extends TwitterapiAction * * Returns a version number for this version of Laconica, which * should make things a bit easier for upgrades. + * URL: http://identi.ca/api/laconica/version.(xml|json) + * Formats: xml, json * * @param array $args Web arguments * @param array $apidata Twitter API data @@ -65,7 +67,18 @@ class TwitapilaconicaAction extends TwitterapiAction function version($args, $apidata) { parent::handle($args); - common_server_error(_('API method under construction.'), 501); + switch ($apidata['content-type']) { + case 'xml': + $this->init_document('xml'); + common_element('version', null, LACONICA_VERSION); + $this->end_document('xml'); + case 'json': + $this->init_document('json'); + print '"'.LACONICA_VERSION.'"'; + $this->end_document('json'); + default: + $this->client_error(_('API method not found!'), $code=404); + } } /** diff --git a/_darcs/tentative_pristine b/_darcs/tentative_pristine index ce01d3b5b..02f15d0f6 100644 --- a/_darcs/tentative_pristine +++ b/_darcs/tentative_pristine @@ -1,6 +1,17 @@ -hunk ./actions/api.php 120 -- 'help/downtime_schedule'); -+ 'help/downtime_schedule', -+ 'laconica/version', -+ 'laconica/config', -+ 'laconica/wadl'); +hunk ./actions/twitapilaconica.php 56 ++ * URL: http://identi.ca/api/laconica/version.(xml|json) ++ * Formats: xml, json +hunk ./actions/twitapilaconica.php 70 +- common_server_error(_('API method under construction.'), 501); ++ switch ($apidata['content-type']) { ++ case 'xml': ++ $this->init_document('xml'); ++ common_element('version', null, LACONICA_VERSION); ++ $this->end_document('xml'); ++ case 'json': ++ $this->init_document('json'); ++ print '"'.LACONICA_VERSION.'"'; ++ $this->end_document('json'); ++ default: ++ $this->client_error(_('API method not found!'), $code=404); ++ } diff --git a/actions/twitapilaconica.php b/actions/twitapilaconica.php index 092f9e7d1..4ecbf94e1 100644 --- a/actions/twitapilaconica.php +++ b/actions/twitapilaconica.php @@ -53,6 +53,8 @@ class TwitapilaconicaAction extends TwitterapiAction * * Returns a version number for this version of Laconica, which * should make things a bit easier for upgrades. + * URL: http://identi.ca/api/laconica/version.(xml|json) + * Formats: xml, json * * @param array $args Web arguments * @param array $apidata Twitter API data @@ -65,7 +67,18 @@ class TwitapilaconicaAction extends TwitterapiAction function version($args, $apidata) { parent::handle($args); - common_server_error(_('API method under construction.'), 501); + switch ($apidata['content-type']) { + case 'xml': + $this->init_document('xml'); + common_element('version', null, LACONICA_VERSION); + $this->end_document('xml'); + case 'json': + $this->init_document('json'); + print '"'.LACONICA_VERSION.'"'; + $this->end_document('json'); + default: + $this->client_error(_('API method not found!'), $code=404); + } } /** |