From 50b80e9e2452cfffadeb6918150736a4dde7834a Mon Sep 17 00:00:00 2001 From: czaks Date: Tue, 10 Mar 2015 14:06:44 +0100 Subject: ... (slug api) --- inc/api.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc/api.php') diff --git a/inc/api.php b/inc/api.php index c9608f06..351943a3 100644 --- a/inc/api.php +++ b/inc/api.php @@ -33,6 +33,7 @@ class Api { 'sticky' => 'sticky', 'locked' => 'locked', 'bump' => 'last_modified', + 'slug' => 'semantic_url', ); $this->threadsPageFields = array( -- cgit v1.3 From 6c4d3941fa729558f4a5313081c85b0a06202e54 Mon Sep 17 00:00:00 2001 From: czaks Date: Tue, 10 Mar 2015 14:22:29 +0100 Subject: api fix --- inc/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/api.php') diff --git a/inc/api.php b/inc/api.php index c9608f06..661ee109 100644 --- a/inc/api.php +++ b/inc/api.php @@ -109,7 +109,7 @@ class Api { if (isset($post->files) && $post->files && !$threadsPage) { $file = $post->files[0]; $this->translateFields($this->fileFields, $file, $apiPost); - $apiPost['filename'] = substr($file->name, 0, strrpos($file->name, '.')); + $apiPost['filename'] = isset($file->name) ? substr($file->name, 0, strrpos($file->name, '.')) : ""; $dotPos = strrpos($file->file, '.'); $apiPost['ext'] = substr($file->file, $dotPos); $apiPost['tim'] = substr($file->file, 0, $dotPos); -- cgit v1.3 From 4a22ee9245b81e9a94bcc18128cf9ad10d19d901 Mon Sep 17 00:00:00 2001 From: 8chan Date: Thu, 30 Oct 2014 05:33:01 -0700 Subject: Extra files and IDs in API Conflicts: inc/api.php --- inc/api.php | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'inc/api.php') diff --git a/inc/api.php b/inc/api.php index ac3b1325..eb99d3fb 100644 --- a/inc/api.php +++ b/inc/api.php @@ -86,11 +86,22 @@ class Api { } } + private function translateFile($file, $post, &$apiPost) { + $this->translateFields($this->fileFields, $file, $apiPost); + $apiPost['filename'] = @substr($file->name, 0, strrpos($file->name, '.')); + $dotPos = strrpos($file->file, '.'); + $apiPost['ext'] = substr($file->file, $dotPos); + $apiPost['tim'] = substr($file->file, 0, $dotPos); + $apiPost['md5'] = base64_encode(hex2bin($post->filehash)); + } + private function translatePost($post, $threadsPage = false) { + global $config, $board; $apiPost = array(); $fields = $threadsPage ? $this->threadsPageFields : $this->postFields; $this->translateFields($fields, $post, $apiPost); + if (isset($config['poster_ids'])) $apiPost['id'] = poster_id($post->ip, $post->thread, $board['uri']); if ($threadsPage) return $apiPost; // Handle country field @@ -109,12 +120,19 @@ class Api { // Note: 4chan only supports one file, so only the first file is taken into account for 4chan-compatible API. if (isset($post->files) && $post->files && !$threadsPage) { $file = $post->files[0]; - $this->translateFields($this->fileFields, $file, $apiPost); - $apiPost['filename'] = isset($file->name) ? substr($file->name, 0, strrpos($file->name, '.')) : ""; - $dotPos = strrpos($file->file, '.'); - $apiPost['ext'] = substr($file->file, $dotPos); - $apiPost['tim'] = substr($file->file, 0, $dotPos); - $apiPost['md5'] = base64_encode(hex2bin($post->filehash)); + $this->translateFile($file, $post, $apiPost); + if (sizeof($post->files) > 1) { + $extra_files = array(); + foreach ($post->files as $i => $f) { + if ($i == 0) continue; + + $extra_file = array(); + $this->translateFile($f, $post, $extra_file); + + $extra_files[] = $extra_file; + } + $apiPost['extra_files'] = $extra_files; + } } return $apiPost; -- cgit v1.3 From e35d261ff48e38ea109e29feeed7f8edaaf82b4a Mon Sep 17 00:00:00 2001 From: czaks Date: Tue, 31 Mar 2015 05:32:38 +0200 Subject: enable embed field for api --- inc/api.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'inc/api.php') diff --git a/inc/api.php b/inc/api.php index eb99d3fb..f8f2a71c 100644 --- a/inc/api.php +++ b/inc/api.php @@ -1,4 +1,4 @@ - 'sticky', 'locked' => 'locked', 'bump' => 'last_modified', + 'embed' => 'embed', 'slug' => 'semantic_url', ); -- cgit v1.3 From 5a9af83ba64fcc5547f3c5206121cff3992a3663 Mon Sep 17 00:00:00 2001 From: czaks Date: Tue, 31 Mar 2015 05:50:52 +0200 Subject: better slugify support for api --- inc/api.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'inc/api.php') diff --git a/inc/api.php b/inc/api.php index f8f2a71c..a057f4ed 100644 --- a/inc/api.php +++ b/inc/api.php @@ -34,7 +34,6 @@ class Api { 'locked' => 'locked', 'bump' => 'last_modified', 'embed' => 'embed', - 'slug' => 'semantic_url', ); $this->threadsPageFields = array( @@ -117,6 +116,10 @@ class Api { } } + if ($config['slugify'] && !$post->thread) { + $apiPost['semantic_url'] = $post->slug; + } + // Handle files // Note: 4chan only supports one file, so only the first file is taken into account for 4chan-compatible API. if (isset($post->files) && $post->files && !$threadsPage) { -- cgit v1.3 From 8cf28682e74baf592df8b0949e76922fa76de08e Mon Sep 17 00:00:00 2001 From: Jason Puglisi Date: Fri, 3 Apr 2015 08:03:15 -0400 Subject: Removed tab at start of api.php to fix ban list and possibly other stuff --- inc/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/api.php') diff --git a/inc/api.php b/inc/api.php index a057f4ed..b77fa3f8 100644 --- a/inc/api.php +++ b/inc/api.php @@ -1,4 +1,4 @@ - Date: Sat, 30 May 2015 20:46:43 +0200 Subject: the poster IDs were showing in API despite being disabled --- inc/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/api.php') diff --git a/inc/api.php b/inc/api.php index b77fa3f8..57e4d367 100644 --- a/inc/api.php +++ b/inc/api.php @@ -101,7 +101,7 @@ class Api { $fields = $threadsPage ? $this->threadsPageFields : $this->postFields; $this->translateFields($fields, $post, $apiPost); - if (isset($config['poster_ids'])) $apiPost['id'] = poster_id($post->ip, $post->thread, $board['uri']); + if (isset($config['poster_ids']) && $config['poster_ids']) $apiPost['id'] = poster_id($post->ip, $post->thread, $board['uri']); if ($threadsPage) return $apiPost; // Handle country field -- cgit v1.3