badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #168 from DakuTree/master

Browse source 
Shimmie API
This commit is contained in:
Shish 2012-03-09 14:02:12 -08:00
commit 788f25a12d
2 changed files with 72 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
contrib/shimmie_api/main.php
View file

@ -6,6 +6,15 @@
* Documentation:
* <b>Admin Warning:</b> this exposes private data, eg IP addresses
* <p><b>Developer Warning:</b> the API is unstable; notably, private data may get hidden
* <p><b><u>Usage:</b></u>
* <p><b>get_tags</b> - List of all tags. (May contain unused tags)
* <br><ul>tags - <i>Optional</i> - Search for more specific tags (Searchs TAG*)</ul>
* <p><b>get_image</b> - Get image via id.
* <br><ul>id - <i>Required</i> - User id. (Defaults to id=1 if empty)</ul>
* <p><b>find_images</b> - List of latest 12(?) images.
* <p><b>get_user</b> - Get user info. (Defaults to id=2 if both are empty)
* <br><ul>id - <i>Optional</i> - User id.</ul>
* <ul>name - <i>Optional</i> - User name.</ul>
*/
@ -33,12 +42,23 @@ class ShimmieApi extends Extension {
if($event->page_matches("api/shimmie")) {
$page->set_mode("data");
$page->set_type("text/plain");
if(!$event->page_matches("api/shimmie/get_tags") && !$event->page_matches("api/shimmie/get_image") && !$event->page_matches("api/shimmie/find_images") && !$event->page_matches("api/shimmie/get_user")){
$page->set_mode("redirect");
$page->set_redirect(make_link("ext_doc/shimmie_api"));
}
if($event->page_matches("api/shimmie/get_tags")) {
if($event->count_args() == 2) {
if($event->page_matches("api/shimmie/get_tags")){
$arg = $event->get_arg(0);
if(!empty($arg)){
$all = $database->get_all(
"SELECT tag FROM tags WHERE tag LIKE ?",
array($event->get_arg(0)."%"));
array($arg."%"));
}
elseif(isset($_GET['id'])){
$all = $database->get_all(
"SELECT tag FROM tags WHERE tag LIKE ?",
array($_GET['tag']."%"));
}
else {
$all = $database->get_all("SELECT tag FROM tags");
@ -49,7 +69,16 @@ class ShimmieApi extends Extension {
}
if($event->page_matches("api/shimmie/get_image")) {
$image = Image::by_id(int_escape($event->get_arg(0)));
$arg = $event->get_arg(0);
if(!empty($arg)){
$image = Image::by_id(int_escape($event->get_arg(0)));
}
elseif(isset($_GET['id'])){
$image = Image::by_id(int_escape($_GET['id']));
}
else{
$image = Image::by_id(int_escape("1")); //Default to id=1
}
$image->get_tag_array(); // tag data isn't loaded into the object until necessary
$safe_image = new _SafeImage($image);
$page->set_data(json_encode($safe_image));
@ -67,6 +96,39 @@ class ShimmieApi extends Extension {
}
$page->set_data(json_encode($safe_images));
}
if($event->page_matches("api/shimmie/get_user")) {
if(isset($_GET['name'])){
$all = $database->get_all(
"SELECT id,name,joindate,class FROM users WHERE name=?",
array($_GET['name']));
}
if(isset($_GET['id'])){
$all = $database->get_all(
"SELECT id,name,joindate,class FROM users WHERE id=?",
array($_GET['id']));
}
if(!isset($_GET['id']) && !isset($_GET['name'])){
$all = $database->get_all(
"SELECT id,name,joindate,class FROM users WHERE id=?",
array("2")); //In 99% of cases, this will be the admin.
}
$all = $all[0];
//FIXME?: For some weird reason, get_all seems to return twice. Unsetting second value to make things look nice..
for($i=0; $i<4; $i++) unset($all[$i]);
/*TODO: Might be worth making it possible just to get a certain stat (Using &stat=uploadcount or something)
This would lessen strain on DB? */
$all['uploadcount'] = Image::count_images(array("user_id=".$all['id']));
$all['uploadperday'] = sprintf("%.1f", ($all['uploadcount'] / (((time() - strtotime($all['joindate'])) / 86400) + 1)));
$all['commentcount'] = $database->get_one(
"SELECT COUNT(*) AS count FROM comments WHERE owner_id=:owner_id",
array("owner_id"=>$all['id']));
$all['commentperday'] = sprintf("%.1f", ($all['commentcount'] / (((time() - strtotime($all['joindate'])) / 86400) + 1)));
$page->set_data(json_encode($all));
}
}
}
}

6
ext/image/main.php
View file

@ -304,6 +304,12 @@ class ImageIO extends Extension {
if($handler == "merge" || isset($_GET['update'])) {
$merged = array_merge($image->get_tag_array(), $existing->get_tag_array());
send_event(new TagSetEvent($existing, $merged));
if(isset($_GET['rating']) && isset($_GET['update']) && file_exists("ext/rating")){
send_event(new RatingSetEvent($existing, $user, $_GET['rating']));
}
if(isset($_GET['source']) && isset($_GET['update'])){
send_event(new SourceSetEvent($existing, $_GET['source']));
}
return null;
}
else {